|
Revision tags: v2.6.37-rc1 |
|
| #
b74b953b |
| 28-Oct-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
|
|
Revision tags: v2.6.36 |
|
| #
fb9a90f7 |
| 19-Oct-2010 |
Chris Wilson <chris@chris-wilson.co.uk> |
Merge remote branch 'airlied/drm-core-next' into tmp
|
| #
fa251f89 |
| 19-Oct-2010 |
Jens Axboe <jaxboe@fusionio.com> |
Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier
Conflicts:
block/blk-core.c
drivers/block/loop.c
mm/swapfile.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
|
| #
b7ae5056 |
| 19-Oct-2010 |
Dave Airlie <airlied@redhat.com> |
Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next
Conflicts:
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/radeon/r600_blit_kms.c
drivers/gpu/drm/ttm/ttm_bo.c
|
| #
23beab76 |
| 18-Oct-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 'st-ux' and 'unwind' into devel
|
| #
fc371891 |
| 15-Oct-2010 |
Joel Becker <joel.becker@oracle.com> |
Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window
Conflicts:
fs/ocfs2/ocfs2.h
|
| #
6268464b |
| 15-Oct-2010 |
Robert Richter <robert.richter@amd.com> |
Merge remote branch 'tip/perf/core' into oprofile/core
Conflicts:
arch/arm/oprofile/common.c
kernel/perf_event.c
|
|
Revision tags: v2.6.36-rc8 |
|
| #
ce0ecc8a |
| 14-Oct-2010 |
Chris Metcalf <cmetcalf@tilera.com> |
Merge branch 'master' into for-linus
|
| #
ed859ed3 |
| 14-Oct-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/core
Merge reason: update from -rc5 to -almost-final
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
3d8a1a6a |
| 13-Oct-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'amd-iommu/2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
|
| #
4783f393 |
| 13-Oct-2010 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge remote branch 'kumar/merge' into next
|
| #
c0f37d2a |
| 13-Oct-2010 |
Tony Luck <tony.luck@intel.com> |
Merge branches 'release', 'drop_do_IRQ', 'fix_early_irq', 'misc-2.6.37', 'next-fixes', 'optimize-unwind', 'remove-compat-h' and 'stack_trace' into release
|
| #
37eca0d6 |
| 12-Oct-2010 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into core/locking
Reason: Pull in the semaphore related changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
| #
7c5f1351 |
| 12-Oct-2010 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'x86/urgent' of into irq/sparseirq
Reason: Pull in the latest io_apic bugfixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
| #
239060b9 |
| 12-Oct-2010 |
Michal Marek <mmarek@suse.cz> |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
|
| #
ad0f7cfa |
| 11-Oct-2010 |
Robert Richter <robert.richter@amd.com> |
Merge branch 'oprofile/urgent' (early part) into oprofile/perf
|
| #
4e83998f |
| 11-Oct-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/misc' into topic/misc
|
| #
7cd2541c |
| 08-Oct-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.36-rc7' into perf/core
Conflicts:
arch/x86/kernel/module.c
Merge reason: Resolve the conflict, pick up fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
153db80f |
| 08-Oct-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.36-rc7' into core/memblock
Merge reason: Update from -rc3 to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
556ef632 |
| 07-Oct-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.36-rc7' into core/rcu
Merge reason: Update from -rc3 to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
d4f8f217 |
| 07-Oct-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu
|
| #
69259abb |
| 07-Oct-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/pcmcia/pcnet_cs.c
net/caif/caif_socket.c
|
| #
12e94471 |
| 07-Oct-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
|
Revision tags: v2.6.36-rc7 |
|
| #
a9fda02b |
| 04-Oct-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'for_rmk' of git://git.linaro.org/kernel/linux-linaro-next into devel-stable
|
| #
ef70fcc0 |
| 01-Oct-2010 |
Robert Richter <robert.richter@amd.com> |
Merge branch 'oprofile/urgent' into oprofile/core
Conflicts:
arch/arm/oprofile/common.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
|