| #
9f33be2c |
| 25-Feb-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branches 'clks' and 'pnx' into devel
|
| #
03806fa2 |
| 25-Feb-2010 |
David Vrabel <david.vrabel@csr.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
|
| #
996de8c6 |
| 25-Feb-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.33' into core/rcu
Merge reason: Update from -rc4 to -final.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
109d2815 |
| 24-Feb-2010 |
Stefan Richter <stefanr@s5r6.in-berlin.de> |
Merge tag 'v2.6.33' for its firewire changes since last branch point
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
|
| #
d02e30c3 |
| 23-Feb-2010 |
H. Peter Anvin <hpa@zytor.com> |
Merge branch 'x86/irq' into x86/apic
Merge reason:
Conflicts in arch/x86/kernel/apic/io_apic.c
Resolved Conflicts:
arch/x86/kernel/apic/io_apic.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
|
| #
f11cbd74 |
| 22-Feb-2010 |
Jens Axboe <jens.axboe@oracle.com> |
Merge branch 'master' into for-2.6.34
|
| #
8c2fcadc |
| 18-Feb-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
b7e56edb |
| 17-Feb-2010 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into x86/mm
x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.
Signed-off-by: Thomas Gleixner <tglx@linutronix
Merge branch 'linus' into x86/mm
x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
show more ...
|
| #
7fb3a069 |
| 17-Feb-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/misc' into topic/misc
Conflicts:
sound/pci/hda/patch_realtek.c
|
| #
2bb4646f |
| 17-Feb-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
|
| #
ba9341df |
| 16-Feb-2010 |
Jaroslav Kysela <perex@perex.cz> |
Merge branch 'fixes' into devel
|
| #
56012808 |
| 15-Feb-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Conflicts:
arch/arm/Makefile
|
| #
0482e3c6 |
| 11-Feb-2010 |
Tony Lindgren <tony@atomide.com> |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
|
| #
84abd88a |
| 11-Feb-2010 |
H. Peter Anvin <hpa@zytor.com> |
Merge remote branch 'linus/master' into x86/bootmem
|
| #
9ab99d5a |
| 10-Feb-2010 |
Patrick McHardy <kaber@trash.net> |
Merge branch 'master' of /repos/git/net-next-2.6
Signed-off-by: Patrick McHardy <kaber@trash.net>
|
| #
6d3e0907 |
| 08-Feb-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'sched/urgent' into sched/core
Merge reason: Merge dependent fix, update to latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
8e042210 |
| 05-Feb-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/stable-updates'
|
| #
e1a0bdd8 |
| 02-Feb-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into upstream
Conflicts:
drivers/hid/hid-ids.h
|
| #
1a45dcfe |
| 02-Feb-2010 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cfq-iosched: Do not idle on async queues
blk-cgroup: Fix potential deadlock
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cfq-iosched: Do not idle on async queues
blk-cgroup: Fix potential deadlock in blk-cgroup
block: fix bugs in bio-integrity mempool usage
block: fix bio_add_page for non trivial merge_bvec_fn case
drbd: null dereference bug
drbd: fix max_segment_size initialization
show more ...
|
| #
fb7899b1 |
| 02-Feb-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.33-rc6' into secretlab/next-spi
|
| #
ab386128 |
| 02-Feb-2010 |
Tejun Heo <tj@kernel.org> |
Merge branch 'master' into percpu
|
| #
9d3f1881 |
| 02-Feb-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/stable-updates'
|
|
Revision tags: v2.6.33-rc6 |
|
| #
ae7f6711 |
| 29-Jan-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'perf/urgent' into perf/core
Merge reason: We want to queue up a dependent patch. Also update to
later -rc's.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
0ada0a73 |
| 28-Jan-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
|
| #
c84a301d |
| 25-Jan-2010 |
Jens Axboe <jens.axboe@oracle.com> |
Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus
|