|
Revision tags: v2.6.31-rc6 |
|
| #
e290861f |
| 13-Aug-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/stable-updates'
|
| #
aa11d958 |
| 13-Aug-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
|
| #
89034bc2 |
| 11-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/core
Conflicts:
kernel/trace/trace_events_filter.c
We use the tracing/core version.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
f222e8b4 |
| 10-Aug-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
e3560336 |
| 09-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/urgent
Merge reason: Merge up to almost-rc6 to pick up latest perfcounters
(on which we'll queue up a dependent fix)
Signed-off-by: Ingo Molnar <ming
Merge branch 'linus' into tracing/urgent
Merge reason: Merge up to almost-rc6 to pick up latest perfcounters
(on which we'll queue up a dependent fix)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
| #
a131bc18 |
| 08-Aug-2009 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry, Horms).
show more ...
|
| #
012a5299 |
| 06-Aug-2009 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
| #
c00aafcd |
| 05-Aug-2009 |
Rafael J. Wysocki <rjw@sisk.pl> |
Merge branch 'master' into for-linus
|
| #
13efdbec |
| 05-Aug-2009 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-stable
|
| #
8e9ed8b0 |
| 02-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'sched/urgent' into sched/core
Merge reason: avoid upcoming patch conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
|
Revision tags: v2.6.31-rc5 |
|
| #
e1ca4aed |
| 31-Jul-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Update defconfigs for embedded
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Update defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx
powerpc/86xx: Update GE Fanuc sbc310 default configuration
powerpc/86xx: Update defconfig for GE Fanuc's PPC9A
cpm_uart: Don't use alloc_bootmem in cpm_uart_cpm2.c
powerpc/83xx: Fix PCI IO base address on MPC837xE-RDB boards
powerpc/85xx: Don't scan for TBI PHY addresses on MPC8569E-MDS boards
powerpc/85xx: Fix ethernet link detection on MPC8569E-MDS boards
powerpc/mm: Fix SMP issue with MMU context handling code
show more ...
|
| #
34466c5b |
| 30-Jul-2009 |
Kumar Gala <galak@kernel.crashing.org> |
powerpc: Update defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
|
|
Revision tags: v2.6.31-rc4, v2.6.31-rc3, v2.6.31-rc2, v2.6.31-rc1 |
|
| #
7eef4091 |
| 16-Jun-2009 |
J. Bruce Fields <bfields@citi.umich.edu> |
Merge commit 'v2.6.30' into for-2.6.31
|
| #
4894e4ac |
| 11-Jun-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.30' into next
|
| #
4e73e0eb |
| 11-Jun-2009 |
Felix Blyakher <felixb@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
0886751c |
| 10-Jun-2009 |
Robert Richter <robert.richter@amd.com> |
Merge commit 'v2.6.30' into oprofile/master
|
|
Revision tags: v2.6.30 |
|
| #
d2dd01de |
| 09-Jun-2009 |
Joerg Roedel <joerg.roedel@amd.com> |
Merge commit 'tip/core/iommu' into amd-iommu/fixes
|
| #
e635a01e |
| 08-Jun-2009 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux
|
| #
5f4457a4 |
| 07-Jun-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/cpu
|
| #
56fdd18c |
| 07-Jun-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/iommu
Merge reason: This branch was on an -rc5 base so pull almost-2.6.30
to resync with the latest upstream fixes and make sure
the combin
Merge branch 'linus' into core/iommu
Merge reason: This branch was on an -rc5 base so pull almost-2.6.30
to resync with the latest upstream fixes and make sure
the combination works fine.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
|
Revision tags: v2.6.30-rc8 |
|
| #
3d58f48b |
| 01-Jun-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into irq/numa
Conflicts:
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c
Merge reason: we gathered a few conflicts plus update to latest upstream fixes.
Signed-
Merge branch 'linus' into irq/numa
Conflicts:
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c
Merge reason: we gathered a few conflicts plus update to latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
| #
e93721a7 |
| 29-May-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check
|
| #
ee073662 |
| 24-May-2009 |
H. Peter Anvin <hpa@zytor.com> |
Merge branch 'x86/urgent' into x86/setup
Resolved conflicts:
arch/x86/boot/memory.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
|
| #
fc05505b |
| 24-May-2009 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
|
|
Revision tags: v2.6.30-rc7 |
|
| #
e4b63636 |
| 22-May-2009 |
Jens Axboe <jens.axboe@oracle.com> |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
|