| #
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 |
| 18-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
|
| #
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>
|
| #
4783f393 |
| 13-Oct-2010 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge remote branch 'kumar/merge' into next
|
| #
492c032b |
| 12-Oct-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.36-rc7' into spi/next
|
| #
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>
|
| #
4e83998f |
| 11-Oct-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/misc' into topic/misc
|
| #
552dc340 |
| 08-Oct-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'for_rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
|
| #
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>
|
| #
69259abb |
| 06-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 |
| 06-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 |
|
| #
303a4070 |
| 01-Oct-2010 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: invoke DSDT corr
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: invoke DSDT corruption workaround on all Toshiba Satellite
ACPI, APEI, Fix ERST MOVE_DATA instruction implementation
ACPI: fan: Fix more unbalanced code block
ACPI: acpi_pad: simplify code to avoid false gcc build warning
ACPI, APEI, Fix error path for memory allocation
ACPI, APEI, HEST Fix the unsuitable usage of platform_data
ACPI, APEI, Fix acpi_pre_map() return value
ACPI, APEI, Fix APEI related table size checking
ACPI: Disable Windows Vista compatibility for Toshiba P305D
ACPI: Kconfig: fix typo.
ACPI: add missing __percpu markup in arch/x86/kernel/acpi/cstate.c
ACPI: Fix typos
ACPI video: fix a poor warning message
ACPI: fix build warnings resulting from merge window conflict
ACPI: EC: add Vista incompatibility DMI entry for Toshiba Satellite L355
ACPI: expand Vista blacklist to include SP1 and SP2
ACPI: delete ZEPTO idle=nomwait DMI quirk
ACPI: enable repeated PCIEXP wakeup by clearing PCIEXP_WAKE_STS on resume
PM / ACPI: Blacklist systems known to require acpi_sleep=nonvs
ACPI: Don't report current_now if battery reports in mWh
show more ...
|
| #
fdb8c58a |
| 29-Sep-2010 |
Len Brown <len.brown@intel.com> |
Merge branches 'apei', 'battery-mwh-fix', 'bugzilla-10807', 'bugzilla-14736', 'bugzilla-14679', 'bugzilla-16396', 'launchpad-613381' and 'misc' into release
|
|
Revision tags: v2.6.36-rc6, v2.6.36-rc5, v2.6.36-rc4 |
|
| #
58f87ed0 |
| 07-Sep-2010 |
Lucas De Marchi <lucas.de.marchi@gmail.com> |
ACPI: Fix typos
Signed-off-by: Len Brown <len.brown@intel.com>
|
|
Revision tags: v2.6.36-rc3, v2.6.36-rc2, v2.6.36-rc1 |
|
| #
7a996d3a |
| 04-Aug-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.35' into kbuild/kconfig
Conflicts:
scripts/kconfig/Makefile
|
| #
772320e8 |
| 04-Aug-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.35' into kbuild/kbuild
Conflicts:
arch/powerpc/Makefile
|
|
Revision tags: v2.6.35, v2.6.35-rc6, v2.6.35-rc5, v2.6.35-rc4, v2.6.35-rc3, v2.6.35-rc2, v2.6.35-rc1 |
|
| #
b65b3489 |
| 16-May-2010 |
Henrique de Moraes Holschuh <hmh@hmh.eng.br> |
Merge mainline (v2.6.34-rc7)
|
|
Revision tags: v2.6.34 |
|
| #
a9aa1d02 |
| 12-May-2010 |
Frederic Weisbecker <fweisbec@gmail.com> |
Merge commit 'v2.6.34-rc7' into perf/nmi
Merge reason: catch up with latest softlockup detector changes.
|
|
Revision tags: v2.6.34-rc7, v2.6.34-rc6 |
|
| #
d9c5841e |
| 29-Apr-2010 |
H. Peter Anvin <hpa@zytor.com> |
Merge branch 'x86/asm' into x86/atomic
Merge reason:
Conflict between LOCK_PREFIX_HERE and relative alternatives
pointers
Resolved Conflicts:
arch/x86/include/asm/alternative.h
arch/x86/kernel/
Merge branch 'x86/asm' into x86/atomic
Merge reason:
Conflict between LOCK_PREFIX_HERE and relative alternatives
pointers
Resolved Conflicts:
arch/x86/include/asm/alternative.h
arch/x86/kernel/alternative.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
show more ...
|