]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Mar 2011 02:09:02 +0000 (18:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Mar 2011 02:09:02 +0000 (18:09 -0800)
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (adt7411) add MODULE_DEVICE_TABLE
  hwmon: (ad7414) add MODULE_DEVICE_TABLE


Trivial merge