diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 22:24:42 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 22:24:42 +0100 |
| commit | b6825d2df55aa7d7341c715b577b73a6a03dc944 (patch) | |
| tree | ae4f0f52f4c2ad4e501dd323318486ccdd7fcd93 /include/linux/kernel.h | |
| parent | Merge branch 'for-rmk' of git://git.marvell.com/orion (diff) | |
| parent | [ARM] 5302/1: ARM: OMAP: Revert omap3 WDT changes to avoid merge conflict (diff) | |
| download | wireguard-linux-b6825d2df55aa7d7341c715b577b73a6a03dc944.tar.xz wireguard-linux-b6825d2df55aa7d7341c715b577b73a6a03dc944.zip | |
Merge branch 'omap-all' into devel
Conflicts:
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/irq.c
Diffstat (limited to 'include/linux/kernel.h')
0 files changed, 0 insertions, 0 deletions