diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 17:01:00 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 17:01:00 +0100 |
| commit | a07613a54d700a974f3a4a657da78ef5d097315d (patch) | |
| tree | e4bc91713e02fa6d8f08b07de53ea8f905593dfa /arch/arm/include/asm/irq.h | |
| parent | Merge branch 'next-samsung-cleanup-samsung' of git://git.kernel.org/pub/scm/l... (diff) | |
| parent | Merge branch 'next/cleanup' into samsung/dt (diff) | |
| download | linux-a07613a54d700a974f3a4a657da78ef5d097315d.tar.xz linux-a07613a54d700a974f3a4a657da78ef5d097315d.zip | |
Merge branch 'samsung/dt' into samsung/cleanup
Conflicts:
arch/arm/mach-s3c64xx/Makefile
arch/arm/mach-s5pc100/Makefile
arch/arm/mach-s5pv210/Makefile
Pull in previously resolved conflicts:
The Makefiles were reorganized in the "rmk/restart" series and modified
in the "samsung/cleanup series". This also pulls in the other conflict
resolutions from the restart series against the samsung/dt series.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/include/asm/irq.h')
0 files changed, 0 insertions, 0 deletions