diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 18:13:19 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 18:13:19 +0100 |
| commit | 500b9fc922cbec572f4fd1436533bfaed5011262 (patch) | |
| tree | aac4b7de0871e66740aeaf3510f7a59280026592 /scripts/patch-kernel | |
| parent | Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable (diff) | |
| parent | ARM: mach-shmobile: Fix up ap4evb build for LCDC merge damage. (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts:
drivers/net/irda/sh_irda.c
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions