aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-01 06:13:48 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-01 06:13:48 -1000
commit4a2d732f5d1a2adf38a5baaa2f27094024be65e9 (patch)
treefbc8e050fb8f8d66fbb676746888080841882def /arch/x86/pci
parentMerge branch 'for-3.1-rc1' of git://gitorious.org/linux-omap-dss2/linux (diff)
parentMerge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next (diff)
downloadlinux-dev-4a2d732f5d1a2adf38a5baaa2f27094024be65e9.tar.xz
linux-dev-4a2d732f5d1a2adf38a5baaa2f27094024be65e9.zip
Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6
* 'gpio/next' of git://git.secretlab.ca/git/linux-2.6: gpio_msm: Move Qualcomm MSM v2 gpio driver into drivers gpio_msm: Move Qualcomm v6 MSM driver into drivers msm: gpio: Fold register defs into C file msm: gpiomux: Move public API to public header msm: gpio: Remove ifdefs on gpio chip registers msm: gpio: Remove chip-specific register definitions msm: Remove chip-ifdefs for GPIO io mappings msm: gpio: Remove unsupported devices gpio: ab8500: fix MODULE_ALIAS for ab8500 of/gpio: export of_gpio_simple_xlate
Diffstat (limited to 'arch/x86/pci')
0 files changed, 0 insertions, 0 deletions