Merge branch 'master' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/stable...

Conflicts:

	queue-2.6.23/series

diff --cc queue-2.6.23/series
index 7c09e3238c78c12dabe065621e65c848e18409da,fd6fcca9786db00c2affe2b9b91000677a580195..6730ae63ffad99d0eb6da97c039158440c317ab5
--- 1/queue-2.6.23/series
--- 2/queue-2.6.23/series
+++ b/queue-2.6.23/series
@@@ -1,5 -1,1 +1,6 @@@
+ hwmon-be-more-careful-when-changing-vid-input-level.patch
 +dm-table-detect-io-beyond-device.patch
 +dm-crypt-fix-write-endio.patch
 +dm-crypt-use-bio_add_page.patch
 +acpi-video_device_list-corruption.patch
 +acpi-thinkpad-acpi-fix-lenovo-keymap-for-brightness.patch