tree 8dad931aab78c8f83588eec7cd3ff1f6dcae0f65
parent 900b170af40b4fef54e89f3d48d055f7d8031ae6
parent 164d5c3988baf61f40c5749ddc063a9cdca8f521
author Linus Torvalds <torvalds@linux-foundation.org> 1310778210 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1310778210 -0700

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