diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 13:27:34 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 13:27:34 +0200 |
| commit | f9cef506815386df4bd7e463b59e0a0984ce0355 (patch) | |
| tree | b26a202b2f0472e3ebe889012312b115917717f9 /arch/m68k/include/asm/ioctls.h | |
| parent | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev... (diff) | |
| parent | ARM: S5PV310: Support ethernet for SMDKV310 and SMDKC210 (diff) | |
| download | linux-f9cef506815386df4bd7e463b59e0a0984ce0355.tar.xz linux-f9cef506815386df4bd7e463b59e0a0984ce0355.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mach-s3c64xx/dev-audio.c
Diffstat (limited to 'arch/m68k/include/asm/ioctls.h')
0 files changed, 0 insertions, 0 deletions