Merge pull request #352 from P33M/rpi-3.6.y

author popcornmix <popcornmix@gmail.com>

Wed, 7 Aug 2013 14:48:42 +0000 (07:48 -0700)

committer popcornmix <popcornmix@gmail.com>

Wed, 7 Aug 2013 14:48:42 +0000 (07:48 -0700)
author popcornmix <popcornmix@gmail.com>
Wed, 7 Aug 2013 14:48:42 +0000 (07:48 -0700)
committer popcornmix <popcornmix@gmail.com>
Wed, 7 Aug 2013 14:48:42 +0000 (07:48 -0700)
diff --cc drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
Simple merge
author	popcornmix <popcornmix@gmail.com>
	Wed, 7 Aug 2013 14:48:42 +0000 (07:48 -0700)
committer	popcornmix <popcornmix@gmail.com>
	Wed, 7 Aug 2013 14:48:42 +0000 (07:48 -0700)