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)
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
  gpio: wm831x: add a missing break in wm831x_gpio_dbg_show


Trivial merge