|
Revision tags: v2.6.28-rc6 |
|
| #
c032a2de |
| 20-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/cleanups' into x86/irq
[ merged x86/cleanups into x86/irq to enable a wider IRQ entry code
patch to be applied, which depends on a cleanup patch in x86/cleanups. ]
|
| #
90accd6f |
| 20-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/memory-corruption-check
|
| #
fbc2a060 |
| 20-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/uv
|
| #
dba0a918 |
| 19-Nov-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
|
| #
9676e73a |
| 19-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Conflicts:
kernel/trace/ftrace.c
[ We conflicted here because we backported a few fixes to
tracing/urgent - which has diffe
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Conflicts:
kernel/trace/ftrace.c
[ We conflicted here because we backported a few fixes to
tracing/urgent - which has different internal APIs. ]
show more ...
|
| #
3ac3ba0b |
| 19-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/core
Conflicts:
kernel/Makefile
|
| #
198d6ba4 |
| 19-Nov-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/isdn/i4l/isdn_net.c
fs/cifs/connect.c
|
| #
cea555d3 |
| 19-Nov-2008 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'linux-2.6' into next
|
| #
5177dc3f |
| 18-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/urgent
|
| #
73f56c0d |
| 18-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
|
| #
9dacc71f |
| 17-Nov-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.28-rc5' into x86/cleanups
|
|
Revision tags: v2.6.28-rc5 |
|
| #
2b828925 |
| 14-Nov-2008 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
Conflicts:
security/keys/internal.h
security/keys/process_keys.c
security/keys/request_key.c
Fixed conflicts above by using the non 'tsk' versions.
Signed-off-by
Merge branch 'master' into next
Conflicts:
security/keys/internal.h
security/keys/process_keys.c
security/keys/request_key.c
Fixed conflicts above by using the non 'tsk' versions.
Signed-off-by: James Morris <jmorris@namei.org>
show more ...
|
| #
65131cd5 |
| 12-Nov-2008 |
Rodolfo Giometti <giometti@linux.it> |
c2port: add c2port support for Eurotech Duramar 2150
Signed-off-by: Rodolfo Giometti <giometti@linux.it>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-
c2port: add c2port support for Eurotech Duramar 2150
Signed-off-by: Rodolfo Giometti <giometti@linux.it>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|