Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 May 2011 15:47:12 +0000 (08:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 May 2011 15:47:12 +0000 (08:47 -0700)
commitfa515888821d307a79cb8d1e8e052b7aff39d844
tree5d04ecc5289184c4cc5ab990e4132bac51385fcc
parentbc9be57f85d465506d0d4a8951275dae4e694f16
parentc30aa39c233ca1df8397eb9e9c8b40a397ce72bb
Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (twl4030-madc-hwmon) Return proper error if hwmon_device_register fails