diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-02 13:48:33 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-02 13:48:33 -0700 |
commit | ac001e76546523ec2ef05b2f7001d8fdc588d069 (patch) | |
tree | 856dbc91a9605bbc1ba93777939b79c9df70e4e3 /arch/x86/include/asm/rtc.h | |
parent | c89ff23960f3e0b72f593a48c808c25f9e7f5a93 (diff) | |
parent | 04c235c92ce8474e9f2b358bd97f013a500385f2 (diff) | |
download | op-kernel-dev-ac001e76546523ec2ef05b2f7001d8fdc588d069.zip op-kernel-dev-ac001e76546523ec2ef05b2f7001d8fdc588d069.tar.gz |
Merge tag 'usb-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB patches from Greg Kroah-Hartman:
"Here are two EHCI Tegra driver patches for your tree.
The first is a bit big, but the majority is just moving code around.
It is needed due to the other EHCI core changes that went in way back
in 3.4-rc1, so this driver will now properly handle suspend/resume, as
it was broken. The other one is a minor bugfix that resolves an
warning that people have been seeing."
* tag 'usb-3.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
USB: ehci-tegra: remove redundant gpio_set_value
EHCI: update PM methods in ehci-tegra.c
Diffstat (limited to 'arch/x86/include/asm/rtc.h')
0 files changed, 0 insertions, 0 deletions