summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ohci-sa1111.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-08-04 11:56:17 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-08-04 11:56:17 +0900
commit701ec7a7b04a62c74ab1b83b59a3fd35c0ba5fdb (patch)
treec07aa954f48ec45c422641052d46008697a4a6b1 /drivers/usb/host/ohci-sa1111.c
parent285eba57db7bd7d7c3c5929fb8621fdcaaea1b00 (diff)
parent3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff)
downloadlinux-701ec7a7b04a62c74ab1b83b59a3fd35c0ba5fdb.tar.gz
linux-701ec7a7b04a62c74ab1b83b59a3fd35c0ba5fdb.tar.bz2
linux-701ec7a7b04a62c74ab1b83b59a3fd35c0ba5fdb.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: arch/arm/configs/ap4evb_defconfig arch/arm/configs/g3evm_defconfig arch/arm/configs/g4evm_defconfig Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/usb/host/ohci-sa1111.c')
0 files changed, 0 insertions, 0 deletions