mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
d7ca21393d39cb2e73dfc4c516e7be37ba01789e
linux/kernel
History
Linus Torvalds 7a9b149212 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
  USB: remove unused usb_buffer_alloc and usb_buffer_free macros
  usb: musb: update gfp/slab.h includes
  USB: ftdi_sio: fix legacy SIO-device header
  USB: kl5usb105: reimplement using generic framework
  USB: kl5usb105: minor clean ups
  USB: kl5usb105: fix memory leak
  USB: io_ti: use kfifo to implement write buffering
  USB: io_ti: remove unsused private counter
  USB: ti_usb: use kfifo to implement write buffering
  USB: ir-usb: fix incorrect write-buffer length
  USB: aircable: fix incorrect write-buffer length
  USB: safe_serial: straighten out read processing
  USB: safe_serial: reimplement read using generic framework
  USB: safe_serial: reimplement write using generic framework
  usb-storage: always print quirks
  USB: usb-storage: trivial debug improvements
  USB: oti6858: use port write fifo
  USB: oti6858: use kfifo to implement write buffering
  USB: cypress_m8: use kfifo to implement write buffering
  USB: cypress_m8: remove unused drain define
  ...

Fix up conflicts (due to usb_buffer_alloc/free renaming) in
	drivers/input/tablet/acecad.c
	drivers/input/tablet/kbtab.c
	drivers/input/tablet/wacom_sys.c
	drivers/media/video/gspca/gspca.c
	sound/usb/usbaudio.c
2010-05-20 21:26:12 -07:00
..
gcov
…
irq
genirq: Clear CPU mask in affinity_hint when none is provided
2010-05-12 11:23:34 +02:00
power
PM / Hibernate: Fix block_io.c printk warning
2010-05-10 23:08:18 +02:00
time
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-19 17:11:10 -07:00
trace
Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 08:35:04 -07:00
.gitignore
…
acct.c
Merge branch 'next' into for-linus
2010-05-18 08:57:00 +10:00
async.c
…
audit_tree.c
…
audit_watch.c
…
audit.c
…
audit.h
…
auditfilter.c
…
auditsc.c
…
backtracetest.c
…
bounds.c
…
capability.c
…
cgroup_freezer.c
Freezer / cgroup freezer: Update stale locking comments
2010-05-10 23:18:47 +02:00
cgroup.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-05-20 09:20:59 -07:00
compat.c
cpumask: fix compat getaffinity
2010-05-19 11:48:18 -07:00
configs.c
…
cpu.c
…
cpuset.c
…
cred.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
2010-05-20 08:55:50 -07:00
delayacct.c
…
dma.c
…
early_res.c
…
elfcore.c
…
exec_domain.c
…
exit.c
…
extable.c
…
fork.c
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 08:19:03 -07:00
freezer.c
…
futex_compat.c
…
futex.c
…
groups.c
…
hrtimer.c
…
hung_task.c
…
hw_breakpoint.c
…
itimer.c
…
kallsyms.c
…
Kconfig.freezer
…
Kconfig.hz
…
Kconfig.locks
…
Kconfig.preempt
…
kexec.c
kexec: fix OOPS in crash_kernel_shrink
2010-05-11 17:33:42 -07:00
kfifo.c
…
kgdb.c
…
kmod.c
…
kprobes.c
kprobes: Move enable/disable_kprobe() out from debugfs code
2010-05-08 18:08:30 +02:00
ksysfs.c
…
kthread.c
…
latencytop.c
…
lockdep_internals.h
…
lockdep_proc.c
…
lockdep_states.h
…
lockdep.c
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 08:19:03 -07:00
Makefile
cpu_stop: add dummy implementation for UP
2010-05-08 17:12:33 +02:00
module.c
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 08:27:54 -07:00
mutex-debug.c
…
mutex-debug.h
…
mutex.c
…
mutex.h
…
notifier.c
…
ns_cgroup.c
…
nsproxy.c
…
padata.c
…
panic.c
…
params.c
…
perf_event.c
perf: Fix exit() vs event-groups
2010-05-11 17:08:24 +02:00
pid_namespace.c
…
pid.c
…
pm_qos_params.c
PM: PM QOS update fix
2010-05-17 00:21:03 +02:00
posix-cpu-timers.c
posix-cpu-timers: Optimize run_posix_cpu_timers()
2010-05-10 14:24:26 +02:00
posix-timers.c
…
printk.c
…
profile.c
profile: fix stats and data leakage
2010-05-14 19:45:06 -07:00
ptrace.c
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 08:19:03 -07:00
range.c
…
rcupdate.c
rcu: slim down rcutiny by removing rcu_scheduler_active and friends
2010-05-10 11:08:34 -07:00
rcutiny_plugin.h
rcu: slim down rcutiny by removing rcu_scheduler_active and friends
2010-05-10 11:08:34 -07:00
rcutiny.c
rcu: remove all rcu head initializations, except on_stack initializations
2010-05-11 16:10:47 -07:00
rcutorture.c
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 08:27:54 -07:00
rcutree_plugin.h
rcu: remove all rcu head initializations, except on_stack initializations
2010-05-11 16:10:47 -07:00
rcutree_trace.c
rcu: reduce the number of spurious RCU_SOFTIRQ invocations
2010-05-10 11:08:35 -07:00
rcutree.c
rcu: remove all rcu head initializations, except on_stack initializations
2010-05-11 16:10:47 -07:00
rcutree.h
rcu: reduce the number of spurious RCU_SOFTIRQ invocations
2010-05-10 11:08:35 -07:00
relay.c
…
res_counter.c
…
resource.c
…
rtmutex_common.h
…
rtmutex-debug.c
…
rtmutex-debug.h
…
rtmutex-tester.c
…
rtmutex.c
…
rtmutex.h
…
rwsem.c
…
sched_clock.c
…
sched_cpupri.c
…
sched_cpupri.h
…
sched_debug.c
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-05-18 08:27:54 -07:00
sched_fair.c
sched: replace migration_thread with cpu_stop
2010-05-06 18:49:21 +02:00
sched_features.h
…
sched_idletask.c
…
sched_rt.c
…
sched_stats.h
…
sched.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2010-05-20 21:26:12 -07:00
seccomp.c
…
semaphore.c
…
signal.c
…
slow-work-debugfs.c
…
slow-work.c
…
slow-work.h
…
smp.c
…
softirq.c
rcu: refactor RCU's context-switch handling
2010-05-10 11:08:33 -07:00
softlockup.c
…
spinlock.c
…
srcu.c
…
stacktrace.c
…
stop_machine.c
stop_machine: Move local variable closer to the usage site in cpu_stop_cpu_callback()
2010-05-18 00:17:44 +02:00
sys_ni.c
…
sys.c
…
sysctl_binary.c
ipv4: remove ip_rt_secret timer (v4)
2010-05-08 01:57:52 -07:00
sysctl_check.c
…
sysctl.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-05-20 21:04:44 -07:00
taskstats.c
…
test_kprobes.c
…
time.c
Merge branch 'linus' into timers/core
2010-05-10 14:20:42 +02:00
timeconst.pl
…
timer.c
Merge branch 'linus' into timers/core
2010-05-10 14:20:42 +02:00
tracepoint.c
…
tsacct.c
…
uid16.c
…
up.c
…
user_namespace.c
…
user-return-notifier.c
…
user.c
sched: Remove a stale comment
2010-05-10 08:48:39 +02:00
utsname_sysctl.c
…
utsname.c
…
wait.c
…
workqueue.c
…