Merge branch 'master' into upstream
authorJiri Kosina <jkosina@suse.cz>
Tue, 2 Feb 2010 22:10:39 +0000 (23:10 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 2 Feb 2010 22:10:39 +0000 (23:10 +0100)
commite1a0bdd8022317e98650e70850de73eccfcde5ad
tree462f63307118b95c8cbacee6954e4d09ee85b8d1
parent8127f4e883666c9960cfa89cffd36313748f8bab
parent1a45dcfe2525e9432cb4aba461d4994fc2befe42
Merge branch 'master' into upstream

Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-apple.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-lg.h
drivers/hid/usbhid/hid-core.c
include/linux/input.h