summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-16 03:03:30 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-16 03:03:30 +0200
commit1765a367a3b5d5e9692949b0c5ec933eff2c0701 (patch)
tree8dad931aab78c8f83588eec7cd3ff1f6dcae0f65 /drivers/acpi
parentARM: fix regression in IXP4xx clocksource (diff)
parentgpio: wm831x: add a missing break in wm831x_gpio_dbg_show (diff)
downloadlinux-1765a367a3b5d5e9692949b0c5ec933eff2c0701.tar.xz
linux-1765a367a3b5d5e9692949b0c5ec933eff2c0701.zip
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6: gpio: wm831x: add a missing break in wm831x_gpio_dbg_show
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions