Merge branch 'linus' into out-of-tree
commitafb099baf6a96cee87fff4f053db2d17c41d6337
authorIngo Molnar <mingo@elte.hu>
Thu, 26 May 2011 12:11:57 +0000 (26 14:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 May 2011 12:11:57 +0000 (26 14:11 +0200)
tree444000297b4816fc611cf89ef54e26543379ad0d
parent721fff009411326b73663da53182d3cbe79a1fd0
parent4db70f73e56961b9bcdfd0c36c62847a18b7dbb5
Merge branch 'linus' into out-of-tree
drivers/hwmon/k8temp.c
fs/Kconfig