xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'samsung/driver' into next/drivers

Browse Source 
Conflicts:
	arch/arm/mach-mxs/include/mach/common.h

Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2012-01-09 16:16:29 +00:00
parent 15db3e823c 142f2101a8
commit dcf7ec5ee6
1271 changed files with 12339 additions and 12749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-pxa/lubbock.c
View File

@@ -556,4 +556,5 @@ MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
.handle_irq = pxa25x_handle_irq,
.timer = &pxa_timer,
.init_machine = lubbock_init,
.restart = pxa_restart,
MACHINE_END