Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jul 2011 01:03:30 +0000 (18:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jul 2011 01:03:30 +0000 (18:03 -0700)
commit1765a367a3b5d5e9692949b0c5ec933eff2c0701
tree8dad931aab78c8f83588eec7cd3ff1f6dcae0f65
parent900b170af40b4fef54e89f3d48d055f7d8031ae6
parent164d5c3988baf61f40c5749ddc063a9cdca8f521
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