diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-30 02:17:35 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-30 02:17:35 +0200 |
commit | 6bec11921a7d7b11d0b1909596636632aece5a26 (patch) | |
tree | 1bf2ac7d5c482afb2c5cf59c0fc7db7c7ac03ff6 /fs/xfs/xfs_dmapi.h | |
parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
parent | ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is n... (diff) | |
download | linux-6bec11921a7d7b11d0b1909596636632aece5a26.tar.xz linux-6bec11921a7d7b11d0b1909596636632aece5a26.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is not working.
ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB
ARM: 6030/1: KS8695: enable console
ARM: 6060/1: PL061 GPIO: Setting gpio val after changing direction to OUT.
ARM: 6059/1: PL061 GPIO: Changing *_irq_chip_data with *_irq_data for real irqs.
ARM: 6023/1: update bcmring_defconfig to latest version and fix build error
ARM: fix build error in arch/arm/kernel/process.c
Diffstat (limited to 'fs/xfs/xfs_dmapi.h')
0 files changed, 0 insertions, 0 deletions