Merge branch 'linus' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Tue, 2 Dec 2008 19:09:50 +0000 (20:09 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 2 Dec 2008 19:09:50 +0000 (20:09 +0100)
Conflicts:
kernel/trace/ring_buffer.c


Trivial merge