commit 21a2cb565a74bf794d343ce22300c5f6c1568ae1
author Linus Torvalds <torvalds@linux-foundation.org> Mon Jan 09 12:08:59 2012 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Jan 09 12:08:59 2012 -0800
tree 5cf49d94bc8cc31a299417b8a362f0645b41c543
parent c99516ca854770000c277b2680a15581c691e18c
parent 2a5ac6f7a9c0a24adcf68e0dd634afbe083191c1

Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

* 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  isl29020: Remove a redundant semi-colon from return statement
  BMP085: Remove redundant semi-colon from return statement
  drivers:misc: ti-st: DEBUG uart, baud rate mods
  drivers:misc: ti-st: flush UART upon fw failure
  drivers:misc: ti-st: protect registrations
  char_dev.c: fix up some whitespace errors
  s390: tape_class.h: remove kobj_map.h inclusion
  misc: ad525x_dpot: Add support for SPI module device table matching