Linus Torvalds
3e5b08cbbf
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
...
* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (144 commits)
USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004)
USB: serial: ftdi_sio: add support for TIOCSERGETLSR
USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport
USB: atmel_usba_udc: fix freeing irq in usba_udc_remove()
usb: ehci-omap: fix tll channel enable mask
usb: ohci-omap3: fix trivial typo
USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096
USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's
USB: gadget: update ci13xxx to work with g_ether
USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers
Revert "USB: musb: pm: don't rely fully on clock support"
Revert "USB: musb: blackfin: pm: make it work"
USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
USB: uas: Ensure we only bind to a UAS interface
USB: uas: Rename sense pipe and sense urb to status pipe and status urb
USB: uas: Use kzalloc instead of kmalloc
USB: uas: Fix up the Sense IU
usb: musb: core: kill unneeded #include's
DA8xx: assign name to MUSB IRQ resource
usb: gadget: g_ncm added
...
Manually fix up trivial conflicts in USB Kconfig changes in:
arch/arm/mach-omap2/Kconfig
arch/sh/Kconfig
drivers/usb/Kconfig
drivers/usb/host/ehci-hcd.c
and annoying chip clock data conflicts in:
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/clock44xx_data.c
2011-01-07 13:16:28 -08:00
..
cpu
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2011-01-07 13:16:28 -08:00
vsyscall
sh: fix vsyscall compilation due to .eh_frame issue
2010-11-17 17:55:37 +09:00
.gitignore
sh: Add an arch/sh/kernel/.gitignore
2008-07-29 08:29:32 +09:00
asm-offsets.c
sh: Add R-standby sleep mode support
2009-10-30 14:38:45 +09:00
cpufreq.c
arch/sh/kernel: Use set_cpus_allowed_ptr
2010-03-29 11:40:37 +09:00
crash_dump.c
sh: shuffle the elfcorehdr handling over to the crash dump code.
2010-05-07 17:58:55 +09:00
debugtraps.S
sh: kgdb: Rework breakpoint handling on top of notifier chain.
2009-12-22 12:44:14 +09:00
disassemble.c
sh: Add a simple code dumper for SUPERH32 show_regs().
2008-12-22 18:43:49 +09:00
dma-nommu.c
sh: Revamp PCI DMA coherence Kconfig bits.
2009-10-27 10:35:02 +09:00
dumpstack.c
sh: flag the default unwinder as reliable.
2009-08-15 01:09:03 +09:00
dwarf.c
sh: handle early calls to return_address() when using dwarf unwinder.
2010-05-25 16:16:40 +09:00
entry-common.S
sh: Correct the offset of the return address in ret_from_exception
2010-02-08 10:46:46 +09:00
ftrace.c
tracing: Unify arch_syscall_addr() implementations
2010-02-17 13:07:21 +01:00
head_32.S
sh: boot kernel with SR.BL set
2010-09-30 09:43:32 +09:00
head_64.S
sh64: Fix up early serial fixmap.
2010-01-12 15:22:26 +09:00
hw_breakpoint.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
2010-05-19 11:36:03 -07:00
idle.c
sh: CPU hotplug support.
2010-04-26 19:08:55 +09:00
init_task.c
Use new __init_task_data macro in arch init_task.c files.
2009-09-21 06:27:08 +02:00
io.c
sh: support for platforms without PIO.
2010-06-02 16:31:42 +09:00
io_trapped.c
sh: wire up perf alignment and emulation faults.
2010-10-13 06:55:26 +09:00
iomap.c
sh: machvec IO death.
2010-11-01 09:49:04 -04:00
ioport.c
sh: machvec IO death.
2010-11-01 09:49:04 -04:00
irq.c
sh: fix up cpu hotplug IRQ migration for irq_data changes.
2010-10-28 11:33:21 +09:00
irq_32.c
Fix IRQ flag handling naming
2010-10-07 14:08:55 +01:00
irq_64.c
sh64: update for IRQ flag handling naming changes.
2010-10-27 15:34:51 +09:00
kdebugfs.c
sh: provide generic arch_debugfs_dir.
2010-09-24 04:04:26 +09:00
kgdb.c
kgdb,sh: update superh kgdb exception handling
2010-05-20 21:04:20 -05:00
kprobes.c
sh: kprobes SMP support.
2010-06-14 17:06:10 +09:00
localtimer.c
sh: CPU hotplug support.
2010-04-26 19:08:55 +09:00
machine_kexec.c
lmb: rename to memblock
2010-07-14 17:14:00 +10:00
machvec.c
sh: machvec IO death.
2010-11-01 09:49:04 -04:00
Makefile
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-01-06 16:50:35 -08:00
module.c
modules: Fix module_bug_list list corruption race
2010-10-05 11:29:27 -07:00
nmi_debug.c
sh: nmi_debug support.
2009-09-01 17:38:32 +09:00
perf_callchain.c
perf: Factorize callchain context handling
2010-08-19 01:32:11 +02:00
perf_event.c
perf: Dynamic pmu types
2010-12-16 11:36:43 +01:00
process.c
Merge branch 'sh/stable-updates'
2010-04-26 16:08:27 +09:00
process_32.c
Make do_execve() take a const filename pointer
2010-08-17 18:07:43 -07:00
process_64.c
Make do_execve() take a const filename pointer
2010-08-17 18:07:43 -07:00
ptrace.c
sh: Add kprobe-based event tracer.
2010-06-14 15:16:53 +09:00
ptrace_32.c
ptrace: cleanup arch_ptrace() on sh
2010-10-27 18:03:12 -07:00
ptrace_64.c
ptrace: cleanup arch_ptrace() on sh
2010-10-27 18:03:12 -07:00
reboot.c
sh: Provide a global TLB flush for U/I-TLB clear.
2010-07-02 15:44:09 +09:00
relocate_kernel.S
sh: add kexec jump support
2009-03-18 18:57:43 +09:00
return_address.c
sh: handle early calls to return_address() when using dwarf unwinder.
2010-05-25 16:16:40 +09:00
setup.c
sh: Break out cpuinfo_op procfs bits.
2010-11-09 16:40:16 +09:00
sh_bios.c
sh: sh_bios detection.
2010-01-12 18:42:52 +09:00
sh_ksyms_32.c
sh: Clean up more superfluous symbol exports.
2009-10-27 11:51:19 +09:00
sh_ksyms_64.c
sh: Clean up more superfluous symbol exports.
2009-10-27 11:51:19 +09:00
signal_32.c
sh: Mass ctrl_in/outX to __raw_read/writeX conversion.
2010-01-26 12:58:40 +09:00
signal_64.c
Merge branch 'sh/stable-updates'
2010-02-15 14:49:37 +09:00
smp.c
sh: native_cpu_disable() build error when CONFIG_HOTPLUG_CPU=n
2010-04-29 23:28:38 +09:00
stacktrace.c
sh: stacktrace: Properly terminate the trace entry buffer.
2009-08-15 01:11:37 +09:00
swsusp.c
sh: hibernation support
2009-03-10 12:55:40 +09:00
sys_sh.c
sh: avoid to flush all cache in sys_cacheflush
2010-11-17 17:55:30 +09:00
sys_sh32.c
Make do_execve() take a const filename pointer
2010-08-17 18:07:43 -07:00
sys_sh64.c
Make do_execve() take a const filename pointer
2010-08-17 18:07:43 -07:00
syscalls_32.S
sh: wire up accept4 syscall (non-multiplexed path)
2010-12-14 17:58:10 +09:00
syscalls_64.S
sh: wire up fanotify/prlimit64 syscalls.
2010-08-16 13:51:18 +09:00
time.c
sh: Convert sh to use read/update_persistent_clock
2010-03-05 02:04:38 +09:00
topology.c
sh: Flag present CPUs hotpluggable in topology registration.
2010-04-26 18:20:29 +09:00
traps.c
sh: Mass ctrl_in/outX to __raw_read/writeX conversion.
2010-01-26 12:58:40 +09:00
traps_32.c
sh: wire up perf alignment and emulation faults.
2010-10-13 06:55:26 +09:00
traps_64.c
sh: wire up perf alignment and emulation faults.
2010-10-13 06:55:26 +09:00
unwinder.c
sh: unwinder: Use a special bug flag for unwinder traps.
2009-08-22 05:28:25 +09:00
vmlinux.lds.S
sh: Kill off some superfluous legacy PMB special casing.
2010-02-16 21:43:38 +09:00