diff options
| author | Russell King | 2009-03-13 22:44:51 +0100 |
|---|---|---|
| committer | Russell King | 2009-03-13 22:44:51 +0100 |
| commit | 97fb44eb6bc01f4ffed4300e475aa15e44877375 (patch) | |
| tree | 481ed6efd0babe7185cae04f2fd295426b36411d /drivers/input/joystick | |
| parent | [ARM] 5422/1: ARM: MMU: add a Non-cacheable Normal executable memory type (diff) | |
| parent | qong: basic support for Dave/DENX QongEVB-LITE board (diff) | |
| download | kernel-qcow2-linux-97fb44eb6bc01f4ffed4300e475aa15e44877375.tar.gz kernel-qcow2-linux-97fb44eb6bc01f4ffed4300e475aa15e44877375.tar.xz kernel-qcow2-linux-97fb44eb6bc01f4ffed4300e475aa15e44877375.zip | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/mach-at91/gpio.c
Diffstat (limited to 'drivers/input/joystick')
0 files changed, 0 insertions, 0 deletions