Merge branch 'master' into SLE12
authorJiri Slaby <jslaby@suse.cz>
Fri, 29 Nov 2013 20:52:18 +0000 (21:52 +0100)
committerJiri Slaby <jslaby@suse.cz>
Fri, 29 Nov 2013 20:53:38 +0000 (21:53 +0100)
commit0554dbabce012383a031e7958548df77a14da440
tree7bbb6392b1f53d1134ce96973ede0b20787c056b
parent10f332fc1bd03e95eb2f38e161dcfb095ec723e3
parent64638c0ec65620cc74efe66cb3efd77a4c883555
Merge branch 'master' into SLE12

Conflicts:
config/* [left unchanged]

suse-commit: 25e0f2484b55496618b00b8174b791d19e941ae4
drivers/usb/core/hub.c
drivers/usb/core/sysfs.c
fs/exec.c
include/linux/sched.h
include/linux/usb.h