summaryrefslogtreecommitdiff
path: root/arch/s390/include/asm/socket.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-06 04:10:44 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-06 04:10:44 +0400
commit98e990afa659769fe7ca1f2408fc7d2e946d5e50 (patch)
treec5efc38aff43420b1b087804e1c15e703dd1c0f2 /arch/s390/include/asm/socket.h
parent75d7b398b74f86244fbb46ea9005438ae0aa33c8 (diff)
parent71919403dc86b40fafd9400738668f96679c551b (diff)
downloadlinux-98e990afa659769fe7ca1f2408fc7d2e946d5e50.tar.xz
Merge tag 'usb-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
USB: revert a powerpc EHCI patch There is just one patch in here, a revert of a powerpc EHCI driver patch that was reported to cause problems. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> * tag 'usb-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: Revert "powerpc/usb: fix issue of CPU halt when missing USB PHY clock"
Diffstat (limited to 'arch/s390/include/asm/socket.h')
0 files changed, 0 insertions, 0 deletions