Merge tag 'v3.13-rc4' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 16 Dec 2013 10:04:49 +0000 (02:04 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 16 Dec 2013 10:04:49 +0000 (02:04 -0800)
Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.


Trivial merge