|
Revision tags: v2.6.37-rc5, v2.6.37-rc4, v2.6.37-rc3, v2.6.37-rc2, 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, v2.6.36-rc8 |
|
| #
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.
|
|
Revision tags: v2.6.36-rc7, v2.6.36-rc6, v2.6.36-rc5, v2.6.36-rc4 |
|
| #
e199e613 |
| 09-Sep-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
daab7fc7 |
| 31-Aug-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.36-rc3' into x86/memblock
Conflicts:
arch/x86/kernel/trampoline.c
mm/memblock.c
Merge reason: Resolve the conflicts, update to latest upstream.
Signed-off-by: Ingo Molnar <min
Merge commit 'v2.6.36-rc3' into x86/memblock
Conflicts:
arch/x86/kernel/trampoline.c
mm/memblock.c
Merge reason: Resolve the conflicts, update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
|
Revision tags: v2.6.36-rc3 |
|
| #
f632265d |
| 26-Aug-2010 |
J. Bruce Fields <bfields@redhat.com> |
Merge commit 'v2.6.36-rc1' into HEAD
|
|
Revision tags: v2.6.36-rc2 |
|
| #
e981b060 |
| 20-Aug-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes
|
| #
c8710ad3 |
| 19-Aug-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
|
| #
6ab561c8 |
| 18-Aug-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/isa' into topic/misc
|
| #
300a103d |
| 16-Aug-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
9714d315 |
| 16-Aug-2010 |
John W. Linville <linville@tuxdriver.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
|
| #
e4862f2f |
| 16-Aug-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.36' into for-2.6.37
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.
Conflicts:
arch/arm/mach-mx2/clock_imx27.c
arch
Merge branch 'for-2.6.36' into for-2.6.37
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.
Conflicts:
arch/arm/mach-mx2/clock_imx27.c
arch/arm/mach-mx2/devices.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-zoom2.c
sound/soc/fsl/mpc5200_dma.c
sound/soc/fsl/mpc5200_dma.h
sound/soc/fsl/mpc8610_hpcd.c
sound/soc/pxa/spitz.c
show more ...
|
| #
bbcf6e8b |
| 16-Aug-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
|
Revision tags: v2.6.36-rc1 |
|
| #
95ee46aa |
| 15-Aug-2010 |
Len Brown <len.brown@intel.com> |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
|
| #
f46a6804 |
| 12-Aug-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into perf/urgent
Merge reason: Fix upstream breakage introduced by:
de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
fb8231a8 |
| 10-Aug-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
|
| #
1989425a |
| 10-Aug-2010 |
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: fix build with make 3.82
Reve
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: fix build with make 3.82
Revert "Input: appletouch - fix integer overflow issue"
memblock: Fix memblock_is_region_reserved() to return a boolean
powerpc: Trim defconfigs
powerpc: fix i8042 module build error
sound/soc: mpc5200_psc_ac97: Use gpio pins for cold reset
powerpc/5200: add mpc5200_psc_ac97_gpio_reset
show more ...
|
| #
61a3e166 |
| 09-Aug-2010 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
powerpc: Trim defconfigs
This trims all our defconfigs using make savedefconfig
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
|
| #
11e4afb4 |
| 06-Aug-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branches 'gemini' and 'misc' into devel
|
| #
d790d4d5 |
| 04-Aug-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
|
| #
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 |
|
| #
7d50d07d |
| 28-Jul-2010 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge remote branch 'linus/master' into x86/cpu
|
| #
4708ac49 |
| 27-Jul-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'origin' into misc
|
| #
5ffdcd94 |
| 26-Jul-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.35-rc6' into spi/test
|
| #
4e4f62bf |
| 24-Jul-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.35-rc6' into devicetree/next
Conflicts:
arch/sparc/kernel/prom_64.c
|