diff options
| author | Greg Kroah-Hartman | 2012-03-12 17:13:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-03-12 17:13:31 +0100 |
| commit | f7a0d426f3e7ec321b8037238b6426566df36edb (patch) | |
| tree | 505e7d0264500db94534f1226684f78af7757289 /arch/arm/mach-s5pc100/include/mach/system.h | |
| parent | Linux 3.3-rc7 (diff) | |
| parent | USB: serial: use module_driver() macro (diff) | |
| download | kernel-qcow2-linux-f7a0d426f3e7ec321b8037238b6426566df36edb.tar.gz kernel-qcow2-linux-f7a0d426f3e7ec321b8037238b6426566df36edb.tar.xz kernel-qcow2-linux-f7a0d426f3e7ec321b8037238b6426566df36edb.zip | |
Merge 3.3-rc7 into usb-next
This resolves the conflict with drivers/usb/host/ehci-fsl.h that
happened with changes in Linus's and this branch at the same time.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-s5pc100/include/mach/system.h')
0 files changed, 0 insertions, 0 deletions