| #
c8b44163 |
| 09-Mar-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.38-rc8' into x86/asm
Merge reason: Update with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
|
Revision tags: v2.6.38-rc8 |
|
| #
1cc26bad |
| 08-Mar-2011 |
James Morris <jmorris@namei.org> |
Merge branch 'master'; commit 'v2.6.38-rc7' into next
|
| #
c871fe66 |
| 03-Mar-2011 |
Colin Cross <ccross@android.com> |
Merge branch 'for-2639/i2c/i2c-tegra' of git://git.fluff.org/bjdooks/linux into for-next-i2c
|
|
Revision tags: v2.6.38-rc7 |
|
| #
6fae9c25 |
| 01-Mar-2011 |
Jens Axboe <jaxboe@fusionio.com> |
Merge commit 'v2.6.38-rc6' into for-2.6.39/core
Conflicts:
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
|
| #
38a5d673 |
| 28-Feb-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.38-rc6' into devicetree/next
Conflicts:
drivers/spi/pxa2xx_spi_pci.c
|
| #
02fa9f04 |
| 25-Feb-2011 |
Tony Lindgren <tony@atomide.com> |
Merge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into devel-fixes
|
| #
e11d57ca |
| 24-Feb-2011 |
Ben Skeggs <bskeggs@redhat.com> |
Merge remote-tracking branch 'airlied/drm-core-next' into drm-nouveau-next
|
| #
f227e08b |
| 24-Feb-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Merge 2.6.38-rc6 into tty-next
This was to resolve a merge issue with drivers/char/Makefile and
drivers/tty/serial/68328serial.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
| #
7acdbb3f |
| 23-Feb-2011 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into x86/platform
Reason: Import mainline device tree changes on which further patches
depend on or conflict.
Trivial conflict in: drivers/spi/pxa2xx_spi_pci.c
Signed-
Merge branch 'linus' into x86/platform
Reason: Import mainline device tree changes on which further patches
depend on or conflict.
Trivial conflict in: drivers/spi/pxa2xx_spi_pci.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
show more ...
|
| #
695884fb |
| 22-Feb-2011 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform
Reason: x86 devicetree support for ce4100 depends on those device tree
changes scheduled for .39.
Signed
Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform
Reason: x86 devicetree support for ce4100 depends on those device tree
changes scheduled for .39.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
show more ...
|
|
Revision tags: v2.6.38-rc6 |
|
| #
43d133c1 |
| 21-Feb-2011 |
Tejun Heo <tj@kernel.org> |
Merge branch 'master' into for-2.6.39
|
| #
da935c66 |
| 20-Feb-2011 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/e1000e/netdev.c
net/xfrm/xfrm_policy.c
|
| #
218502bf |
| 19-Feb-2011 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'irq/urgent' into irq/core
Reason: Further patches are conflicting with mainline fixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
| #
80ae3fa5 |
| 18-Feb-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Merge 2.6.38-rc5 into staging-next
This is to resolve a merge conflict with:
drivers/staging/zram/zram_drv.c
as pointed out by Stephen Rothwell
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Niti
Merge 2.6.38-rc5 into staging-next
This is to resolve a merge conflict with:
drivers/staging/zram/zram_drv.c
as pointed out by Stephen Rothwell
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Robert Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
| #
66b0835e |
| 17-Feb-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Merge 2.6.38-rc5 into usb-next
This is needed to resolve some merge conflicts that were found
in the USB host controller patches, and reported by Stephen Rothwell.
Signed-off-by: Greg Kroah-Hartman
Merge 2.6.38-rc5 into usb-next
This is needed to resolve some merge conflicts that were found
in the USB host controller patches, and reported by Stephen Rothwell.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
| #
a3ec4a60 |
| 16-Feb-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.38-rc5' into core/locking
Merge reason: pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
48fa4b8e |
| 16-Feb-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.38-rc5' into sched/core
Merge reason: Pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
b00560f2 |
| 16-Feb-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'perf/urgent' into perf/core
Merge reason: we need to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
9035a97a |
| 16-Feb-2011 |
Chris Wilson <chris@chris-wilson.co.uk> |
Merge branch 'drm-intel-fixes' into drm-intel-next
Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/
Merge branch 'drm-intel-fixes' into drm-intel-next
Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
show more ...
|
|
Revision tags: v2.6.38-rc5 |
|
| #
0a9d59a2 |
| 15-Feb-2011 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
|
| #
18e95502 |
| 15-Feb-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/st-integration' into sh-latest
|
| #
d60cf53a |
| 15-Feb-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/st-integration' into sh/urgent
|
| #
d2137d5a |
| 14-Feb-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/bootmem
Conflicts:
arch/x86/mm/numa_64.c
Merge reason: fix the conflict, update to latest -rc and pick up this
dependent fix from Yinghai:
e6d2e2b2b1
Merge branch 'linus' into x86/bootmem
Conflicts:
arch/x86/mm/numa_64.c
Merge reason: fix the conflict, update to latest -rc and pick up this
dependent fix from Yinghai:
e6d2e2b2b1e1: memblock: don't adjust size in memblock_find_base()
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
| #
6148a47a |
| 10-Feb-2011 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
deb-pkg: Fix building ou
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
deb-pkg: Fix building outside of source tree (O=...).
deb-pkg: Use $SRCARCH for include path
show more ...
|
|
Revision tags: v2.6.38-rc4 |
|
| #
0f54088a |
| 04-Feb-2011 |
Michal Marek <mmarek@suse.cz> |
Merge branch 'kbuild/packaging' into kbuild/rc-fixes
|