| #
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>
|
| #
ab386128 |
| 02-Feb-2010 |
Tejun Heo <tj@kernel.org> |
Merge branch 'master' into percpu
|
| #
a814290e |
| 27-Jan-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
|
| #
f1487fcb |
| 25-Jan-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.33' into for-2.6.34
|
| #
51c24aaa |
| 23-Jan-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
|
| #
7755726f |
| 22-Jan-2010 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.33-rc5' into next
|
| #
9e4c8496 |
| 19-Jan-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
|
| #
2457552d |
| 17-Jan-2010 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
| #
64b9fb57 |
| 26-Feb-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.33' into tracing/core
Conflicts:
scripts/recordmcount.pl
Merge reason: Merge up to v2.6.33.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
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 ...
|
| #
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>
|
| #
e1a0bdd8 |
| 02-Feb-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into upstream
Conflicts:
drivers/hid/hid-ids.h
|
| #
0ada0a73 |
| 28-Jan-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
|
| #
6be32571 |
| 23-Jan-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
61405fea |
| 13-Jan-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'perf/urgent' into perf/core
Merge reason: queue up dependent patch, update to -rc4
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
|
Revision tags: v2.6.33-rc4 |
|
| #
644755e7 |
| 13-Jan-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branches 'sh/xstate', 'sh/hw-breakpoints' and 'sh/stable-updates'
|
| #
e7db7b42 |
| 08-Jan-2010 |
Albin Tonnerre <albin.tonnerre@free-electrons.com> |
arm: add support for LZO-compressed kernels
- changes to ach/arch/boot/Makefile to make it easier to add new
compression types
- new piggy.lzo.S necessary for lzo compression
- changes in arch/
arm: add support for LZO-compressed kernels
- changes to ach/arch/boot/Makefile to make it easier to add new
compression types
- new piggy.lzo.S necessary for lzo compression
- changes in arch/arm/boot/compressed/misc.c to allow the use of lzo or
gzip, depending on the config
- Kconfig support
Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
Tested-by: Wu Zhangjin <wuzhangjin@gmail.com>
Acked-by: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Russell King <rmk@arm.linux.org.uk>
Acked-by: Russell King <rmk@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
|
Revision tags: v2.6.33-rc3, v2.6.33-rc2, v2.6.33-rc1, v2.6.32, v2.6.32-rc8, v2.6.32-rc7, v2.6.32-rc6, v2.6.32-rc5, v2.6.32-rc4, v2.6.32-rc3, v2.6.32-rc1, v2.6.32-rc2 |
|
| #
fc8e1ead |
| 14-Sep-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
|
|
Revision tags: v2.6.31 |
|
| #
bbb20089 |
| 09-Sep-2009 |
Dan Williams <dan.j.williams@intel.com> |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
|
| #
a348a7e6 |
| 08-Sep-2009 |
Dan Williams <dan.j.williams@intel.com> |
Merge commit 'v2.6.31-rc1' into dmaengine
|
|
Revision tags: v2.6.31-rc9, v2.6.31-rc8 |
|
| #
8a517c51 |
| 23-Aug-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.31-rc7' into x86/cpu
|
|
Revision tags: v2.6.31-rc7 |
|
| #
f72222c7 |
| 18-Aug-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into upstream/wm8711
|
| #
08229de4 |
| 15-Aug-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.32' into mxc
Conflicts:
sound/soc/Makefile
|