diff options
| author | Linus Torvalds | 2009-11-30 23:50:01 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-11-30 23:50:01 +0100 |
| commit | 07a6d5a49c985ae6111221b93b3a48772cc4b976 (patch) | |
| tree | ab55ca70c64aa8d9d9c8c003092ae9d95d2bfc57 /block/scsi_ioctl.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | Merge branch 'mach-types' (diff) | |
| download | kernel-qcow2-linux-07a6d5a49c985ae6111221b93b3a48772cc4b976.tar.gz kernel-qcow2-linux-07a6d5a49c985ae6111221b93b3a48772cc4b976.tar.xz kernel-qcow2-linux-07a6d5a49c985ae6111221b93b3a48772cc4b976.zip | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Update mach-types
ARM: 5793/1: ARM: Check put_user fail in do_signal when enable OABI_COMPAT
MAINTAINERS: add maintainer information for AMBA primecell drivers
[ARM] pxa/spitz: fix compile regression on spitz
ARM: PNX4008: i2c-pnx: use the same dev_id for request_irq and free_irq
[ARM] pxa/cpufreq: fix index assignments for end marker
ARM: PNX4008: fix watchdog device driver name
[ARM] kmap: fix build errors with DEBUG_HIGHMEM enabled
Diffstat (limited to 'block/scsi_ioctl.c')
0 files changed, 0 insertions, 0 deletions