| #
b262e603
|
| 01-Oct-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/wireless/ath9k/core.c
drivers/net/wireless/ath9k/main.c
net/core/dev.c
|
| #
59293c8a
|
| 30-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc8' into oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
e6aa0f07
|
| 24-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc7' into x86/microcode
|
| #
ebdd90a8
|
| 24-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc7' into x86/pebs
|
| #
07bbc16a
|
| 23-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'timers/urgent' into x86/xen
Conflicts:
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
Manual merge:
arch/x86/kernel/smpboot.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
63e5c398
|
| 23-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'sched/urgent' and 'sched/rt' into sched/devel
|
| #
9b9b181c
|
| 23-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc7' into core/locking
|
| #
0b88641f
|
| 22-Sep-2008 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.27-rc7' into x86/debug
|
| #
ab2b4951
|
| 22-Sep-2008 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
Conflicts:
MAINTAINERS
Thanks for breaking my tree :-)
Signed-off-by: James Morris <jmorris@namei.org>
|
| #
21238705
|
| 13-Sep-2008 |
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> |
Add Uwe Kleine-König to .mailmap
There are a few commits that misencoded my name (or used "oe" instead of
"ö"). So add a correct version to .mailmap.
Signed-off-by: Uwe Kleine-König <ukleinek@info
Add Uwe Kleine-König to .mailmap
There are a few commits that misencoded my name (or used "oe" instead of
"ö"). So add a correct version to .mailmap.
Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
| #
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
|
| #
2a5f2e3e
|
| 09-May-2008 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
|
| #
a815752a
|
| 06-May-2008 |
Steve French <sfrench@us.ibm.com> |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
7022b15e
|
| 06-May-2008 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
53809d7e
|
| 30-Apr-2008 |
S.Çağlar Onur <caglar@pardus.org.tr> |
Update .mailmap
I realize some of the maintainers email clients and/or scripts cannot
handle UTF-8 encoded names properly, as a result your ChangeLogs
displays me as two different person :).
Follow
Update .mailmap
I realize some of the maintainers email clients and/or scripts cannot
handle UTF-8 encoded names properly, as a result your ChangeLogs
displays me as two different person :).
Following patch adds correctly encoded name of mine into .mailmap, to
prevent appearing it not to be so or badly displayed.
Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
| #
48a7afe3
|
| 01-May-2007 |
Wim Van Sebroeck <wim@iguana.be> |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
bc95f366
|
| 01-May-2007 |
Dmitry Torokhov <dtor@insightbb.com> |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
|
| #
49e1900d
|
| 30-Apr-2007 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'linux-2.6' into for-2.6.22
|
| #
ef2e58ea
|
| 26-Apr-2007 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
39a3bfdd
|
| 23-Apr-2007 |
Michael Buesch <mb@bu3sch.de> |
Add mbuesch to .mailmap
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
| #
5a84d159
|
| 20-Feb-2007 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge ARM fixes
|
| #
f630fe28
|
| 17-Feb-2007 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|
| #
e0ab1ec9
|
| 14-Feb-2007 |
Nicolas Pitre <nico@cam.org> |
[PATCH] add .mailmap for proper git-shortlog output
This list was built into the git-shortlog tool and has been removed in the
latest version. It should be maintained separately so this is what thi
[PATCH] add .mailmap for proper git-shortlog output
This list was built into the git-shortlog tool and has been removed in the
latest version. It should be maintained separately so this is what this
patch does.
A couple more entries were added to the original list as well.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Acked-by: Junio C Hamano <junkio@cox.net>
Cc: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|