| #
860cf889 |
| 25-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'irq/sparseirq', 'irq/genirq' and 'irq/urgent'; commit 'v2.6.28' into irq/core
|
| #
0b271ef4 |
| 25-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28' into core/core
|
|
Revision tags: v2.6.28 |
|
| #
1ccedb7c |
| 23-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc9' into x86/apic
|
| #
27a0464a |
| 22-Dec-2008 |
Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> |
[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/xfs/xfs_rename.c
Signed-off-by: Lachlan McIlroy <lachlan@sgi.
[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/xfs/xfs_rename.c
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
show more ...
|
| #
6a843641 |
| 20-Dec-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/ca0106-capture-no-44khz' into topic/ca0106
|
| #
93b8eef1 |
| 20-Dec-2008 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.28-rc9' into next
|
| #
30cd324e |
| 19-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core
Conflicts:
include/linux/ftrace.h
|
| #
0ff55519 |
| 19-Dec-2008 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
|
|
Revision tags: v2.6.28-rc9 |
|
| #
d110ec3a |
| 18-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/rcu
|
| #
c15cb37c |
| 16-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/uv
|
| #
78f902cc |
| 16-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/doc
|
| #
dd7a5230 |
| 16-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/cpufeature
|
| #
eb14f019 |
| 15-Dec-2008 |
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/e1000e/ich8lan.c
|
| #
1e1c568d |
| 15-Dec-2008 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'merge' into next
|
| #
7e1548a5 |
| 15-Dec-2008 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
|
| #
45ab6b0c |
| 12-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'sched/core' into cpus4096
Conflicts:
include/linux/ftrace.h
kernel/sched.c
|
| #
fd109027 |
| 12-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/irq
|
| #
e18d7af8 |
| 12-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into x86/mm
|
| #
c1dfdc75 |
| 12-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc8' into sched/core
|
|
Revision tags: v2.6.28-rc8 |
|
| #
c35fa3ea |
| 08-Dec-2008 |
David Vrabel <david.vrabel@csr.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
|
| #
aa9c9b8c |
| 08-Dec-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/quirks
|
| #
56d18e99 |
| 04-Dec-2008 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Return ENOSYS from sys32_syscall on 64bit kernels
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Return ENOSYS from sys32_syscall on 64bit kernels like elsewhere.
MIPS: 64-bit: vmsplice needs to use the compat wrapper for o32 and N32.
MIPS: o32: Fix number of arguments to splice(2).
MIPS: Malta: Consolidate platform device code.
MIPS: IP22, Fulong, Malta: Update defconfigs.
MIPS: Malta: Add back RTC support
MIPS: Fix potential DOS by untrusted user app.
show more ...
|
|
Revision tags: v2.6.28-rc7 |
|
| #
566a3b95 |
| 01-Dec-2008 |
Ralf Baechle <ralf@linux-mips.org> |
MIPS: Malta: Consolidate platform device code.
After adding the RTC platform device to malta-platform.c malta-mtd.c should
get unified with the rest of the platform device code.
|
| #
192cc7f0 |
| 25-Nov-2008 |
Tiejun Chen <tiejun.chen@windriver.com> |
MIPS: Malta: Add back RTC support
With the conversion of MIPS to RTC_LIB the old RTC driver CONFIG_RTC became
unselectable. Fix by setting up a platform device. Also enable
RTC_CLASS so system tim
MIPS: Malta: Add back RTC support
With the conversion of MIPS to RTC_LIB the old RTC driver CONFIG_RTC became
unselectable. Fix by setting up a platform device. Also enable
RTC_CLASS so system time gets set from RTC on kernel initialization.
[Ralf: Original patch by Tiejun; polished nice and shiny by me]
Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
show more ...
|
|
Revision tags: v2.6.28-rc6, v2.6.28-rc5, v2.6.28-rc4, v2.6.28-rc3, v2.6.28-rc2, v2.6.28-rc1 |
|
| #
b2aaf8f7 |
| 15-Oct-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into stackprotector
Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h
|