summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-08-04 15:26:15 +0200
committerJiri Kosina <jkosina@suse.cz>2010-08-04 15:26:15 +0200
commitfc73697bd5bf4efe8b5b2b78ec09e00f967cd055 (patch)
tree326d5f84b13938a12fb27468ef73db4faf43a44e /init
parent1c5474a65bf15a4cb162dfff86d6d0b5a08a740c (diff)
parent8c8b01c38a70661d663175d355fdea85ca082272 (diff)
Merge branch 'upstream' into for-linus
Conflicts: drivers/hid/hid-ids.h
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions