diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 18:30:49 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 18:30:49 +0100 |
commit | 447753d97764b0ae3969936ec495e794baa88052 (patch) | |
tree | 4db7e848aab1891349b34bc173b6626ffc999f44 /lib/dma-debug.c | |
parent | Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | HID: remove BKL from hiddev_ioctl_usage() (diff) | |
parent | HID: support Logitech/3DConnexion SpaceTraveler and SpaceNavigator (diff) | |
parent | HID: add multi-input quirk for NextWindow Touchscreen. (diff) | |
download | linux-447753d97764b0ae3969936ec495e794baa88052.tar.xz linux-447753d97764b0ae3969936ec495e794baa88052.zip |
Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus