|
Revision tags: v2.6.37-rc8 |
|
| #
17f7f4d9 |
| 27-Dec-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/fib_frontend.c
|
| #
26e20a10 |
| 23-Dec-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.37-rc7' into x86/security
|
| #
cfb13c5d |
| 23-Dec-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.37-rc7' into devicetree/next
|
| #
25cf0398 |
| 22-Dec-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
|
| #
4b7bd364 |
| 22-Dec-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too
outdated.
|
| #
6c529a26 |
| 22-Dec-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.37-rc7' into perf/core
Merge reason: Pick up the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
752a4a95 |
| 22-Dec-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.37-rc7' into spi/next
|
| #
7ccbefe0 |
| 22-Dec-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
|
Revision tags: v2.6.37-rc7 |
|
| #
8bcee183 |
| 20-Dec-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'rmobile/urgent' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/include/mach/entry-macro.S
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
| #
ca680888 |
| 19-Dec-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.37-rc6' into sched/core
Merge reason: Update to the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
fea83f6a |
| 18-Dec-2010 |
Tony Lindgren <tony@atomide.com> |
Merge branch 'devel-board' into omap-for-linus
|
| #
ec66ee37 |
| 17-Dec-2010 |
J. Bruce Fields <bfields@redhat.com> |
Merge commit 'v2.6.37-rc6' into for-2.6.38
|
| #
275c8b93 |
| 17-Dec-2010 |
Tejun Heo <tj@kernel.org> |
Merge branch 'this_cpu_ops' into for-2.6.38
|
|
Revision tags: v2.6.37-rc6 |
|
| #
c01c8106 |
| 16-Dec-2010 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ghash-intel - ghash-clmulni-intel_glue needs err.h
|
| #
52f6c5ad |
| 15-Dec-2010 |
Randy Dunlap <randy.dunlap@oracle.com> |
crypto: ghash-intel - ghash-clmulni-intel_glue needs err.h
Add missing header file:
arch/x86/crypto/ghash-clmulni-intel_glue.c:256: error: implicit declaration of function 'IS_ERR'
arch/x86/crypto/
crypto: ghash-intel - ghash-clmulni-intel_glue needs err.h
Add missing header file:
arch/x86/crypto/ghash-clmulni-intel_glue.c:256: error: implicit declaration of function 'IS_ERR'
arch/x86/crypto/ghash-clmulni-intel_glue.c:257: error: implicit declaration of function 'PTR_ERR'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
show more ...
|
|
Revision tags: v2.6.37-rc5, v2.6.37-rc4, v2.6.37-rc3, v2.6.37-rc2, v2.6.37-rc1, v2.6.36, v2.6.36-rc8, v2.6.36-rc7, v2.6.36-rc6, v2.6.36-rc5, v2.6.36-rc4, v2.6.36-rc3, v2.6.36-rc2, v2.6.36-rc1, v2.6.35, v2.6.35-rc6, v2.6.35-rc5, v2.6.35-rc4, v2.6.35-rc3, v2.6.35-rc2, v2.6.35-rc1, v2.6.34, v2.6.34-rc7, v2.6.34-rc6, v2.6.34-rc5, v2.6.34-rc4, v2.6.34-rc3, v2.6.34-rc2, v2.6.34-rc1, v2.6.33, v2.6.33-rc8 |
|
| #
84abd88a |
| 11-Feb-2010 |
H. Peter Anvin <hpa@zytor.com> |
Merge remote branch 'linus/master' into x86/bootmem
|
|
Revision tags: v2.6.33-rc7, v2.6.33-rc6, v2.6.33-rc5, v2.6.33-rc4 |
|
| #
163849ea |
| 12-Jan-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.33' into for-2.6.34
|
|
Revision tags: v2.6.33-rc3 |
|
| #
32032df6 |
| 05-Jan-2010 |
Tejun Heo <tj@kernel.org> |
Merge branch 'master' into percpu
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
|
|
Revision tags: v2.6.33-rc2, v2.6.33-rc1 |
|
| #
b8937162 |
| 14-Dec-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'next/isa' into topic/misc
|
| #
1ad1f10c |
| 09-Dec-2009 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
| #
b7e56edb |
| 17-Feb-2010 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into x86/mm
x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.
Signed-off-by: Thomas Gleixner <tglx@linutronix
Merge branch 'linus' into x86/mm
x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
show more ...
|
| #
0ada0a73 |
| 28-Jan-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
|
| #
7f50548a |
| 26-Dec-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge commit 'v2.6.33-rc2' into for-2.6.33
|
| #
de8853bc |
| 21-Dec-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge remote branch 'alsa/fixes' into fix/hda
|
| #
4b4f887f |
| 21-Dec-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' into sh/hw-breakpoints
|