diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-04-08 05:47:05 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-04-08 05:47:05 -0400 |
| commit | bb3c9d4f851d51bb6302ef0df830dcec88d7c529 (patch) | |
| tree | 446463d0b86dcf68b3a1538861422b1ce582de16 /arch/arm/include/asm/hwcap.h | |
| parent | d4d9959c099751158c5cf14813fe378e206339c6 (diff) | |
| parent | b3aa111f7ac1ad07009081a824b5ce7a71462c4c (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Conflicts:
arch/arm/mach-mx3/mach-pcm037.c
Diffstat (limited to 'arch/arm/include/asm/hwcap.h')
0 files changed, 0 insertions, 0 deletions