| #
4cb40f79 |
| 20-Oct-2008 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h
|
| #
3e10e879 |
| 19-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing-v28-for-linus-v3
Conflicts:
init/main.c
kernel/module.c
scripts/bootgraph.pl
|
| #
ed8c3174 |
| 18-Oct-2008 |
Anton Vorontsov <cbouatmailru@gmail.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/power/Makefile
|
| #
651dab42 |
| 17-Oct-2008 |
Arjan van de Ven <arjan@linux.intel.com> |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
|
| #
0f1f6dec |
| 17-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/urgent
|
| #
5fef06e8 |
| 16-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into genirq
|
| #
25029915 |
| 16-Oct-2008 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 'fixes' into for-linus
Conflicts:
arch/arm/mach-versatile/core.c
|
| #
6dc64725 |
| 15-Oct-2008 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
|
| #
a447c093 |
| 13-Oct-2008 |
Steven Whitehouse <swhiteho@redhat.com> |
vfs: Use const for kernel parser table
This is a much better version of a previous patch to make the parser
tables constant. Rather than changing the typedef, we put the "const" in
all the various p
vfs: Use const for kernel parser table
This is a much better version of a previous patch to make the parser
tables constant. Rather than changing the typedef, we put the "const" in
all the various places where its required, allowing the __initconst
exception for nfsroot which was the cause of the previous trouble.
This was posted for review some time ago and I believe its been in -mm
since then.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Cc: Alexander Viro <aviro@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
|
Revision tags: v2.6.27, v2.6.27-rc9, v2.6.27-rc8, v2.6.27-rc7, v2.6.27-rc6, v2.6.27-rc5, v2.6.27-rc4, v2.6.27-rc3, v2.6.27-rc2 |
|
| #
9fec6060 |
| 30-Jul-2008 |
Anton Vorontsov <cbouatmailru@gmail.com> |
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
|
|
Revision tags: v2.6.27-rc1, v2.6.26 |
|
| #
a8931ef3 |
| 11-Jul-2008 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
|
Revision tags: v2.6.26-rc9 |
|
| #
a8cac817 |
| 03-Jul-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.26-rc8' into x86/mce
|
|
Revision tags: v2.6.26-rc8 |
|
| #
009b9fc9 |
| 23-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/threadinfo
|
|
Revision tags: v2.6.26-rc7 |
|
| #
7aaaec38 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/kconfig
|
| #
d939d285 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/irq
|
| #
fd2c17e1 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/timers
|
| #
064a32d8 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/memtest
|
| #
28638ea4 |
| 16-Jun-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/nmi
Conflicts:
arch/x86/kernel/nmi_32.c
|
|
Revision tags: v2.6.26-rc6, v2.6.26-rc5, v2.6.26-rc4 |
|
| #
2d4b3f37 |
| 20-May-2008 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
c203e45f |
| 19-May-2008 |
Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
|
|
Revision tags: v2.6.26-rc3 |
|
| #
b4ef290d |
| 18-May-2008 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into x86/pat
|
| #
538f0fd0 |
| 17-May-2008 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into x86/gart
|
| #
0e50a4c6 |
| 17-May-2008 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into x86/pebs
|
| #
fcff474e |
| 16-May-2008 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'linux-2.6' into powerpc-next
|
| #
63fe46da |
| 15-May-2008 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
|