Merge branch 'samsung/cleanup' into samsung/driver (142f2101) · Commits · github.com / kvm-riscv / linux

Commit 142f2101 authored Jan 09, 2012 by

Arnd Bergmann

Merge branch 'samsung/cleanup' into samsung/driver



Conflicts:
	arch/arm/mach-s5p64x0/cpu.c -> common.c

More changes to a file that got moved into common.c,
see previous conflict resolutions.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 155bc27f a07613a5

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment