Merge tag v3.9-rc1 into for-3.9/upstream-fixes
authorJiri Kosina <jkosina@suse.cz>
Fri, 29 Mar 2013 14:12:10 +0000 (15:12 +0100)
committerJiri Kosina <jkosina@suse.cz>
Fri, 29 Mar 2013 14:12:21 +0000 (15:12 +0100)
This is done so that I am able to apply fix for commit
0322bd3980b3 ("usb hid quirks for Masterkit MA901 usb radio") which
went into 3.9-rc1.

1  2 
drivers/hid/hid-ids.h

Simple merge