| #
fee1cc08 |
| 12-Jan-2011 |
Simon Horman <horms@verge.net.au> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into HEAD
|
| #
20c040ce |
| 10-Jan-2011 |
Michal Simek <monstr@monstr.eu> |
Merge commit 'v2.6.37' into next
|
| #
1c2a48cf |
| 07-Jan-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/apic-cleanups
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: Resolve the conflict, update to a more recent -rc base
Signed-off-by: Ingo Molnar <mingo@elte.h
Merge branch 'linus' into x86/apic-cleanups
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: Resolve the conflict, update to a more recent -rc base
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
| #
4ec3eb13 |
| 06-Jan-2011 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
|
|
Revision tags: v2.6.37 |
|
| #
bc030d6c |
| 04-Jan-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.37-rc8' into x86/apic
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: move to a fresh -rc, resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
d392da52 |
| 29-Dec-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge v2.6.37-rc8 into powerpc/next
|
|
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
|
| #
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.
|
| #
752a4a95 |
| 22-Dec-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.37-rc7' into spi/next
|
|
Revision tags: v2.6.37-rc7 |
|
| #
ec66ee37 |
| 17-Dec-2010 |
J. Bruce Fields <bfields@redhat.com> |
Merge commit 'v2.6.37-rc6' into for-2.6.38
|
|
Revision tags: v2.6.37-rc6 |
|
| #
474b9c86 |
| 13-Dec-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38
|
| #
354d14b3 |
| 13-Dec-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/workq-update' into topic/misc
|
| #
20aeeb35 |
| 13-Dec-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/workq-update' into topic/asoc
Conflicts:
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8753.c
sound/soc/sh/fsi.c
sound/soc/soc-core.c
|
| #
2ade0c1d |
| 10-Dec-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into upstream
|
| #
ea3398a1 |
| 07-Dec-2010 |
Greg Kroah-Hartman <gregkh@suse.de> |
Staging: Merge 2.6.37-rc5 into staging-next
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly. It also now allows us to fix up the sysfs
attributes proper
Staging: Merge 2.6.37-rc5 into staging-next
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly. It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
|
Revision tags: v2.6.37-rc5 |
|
| #
7d0dbea3 |
| 29-Nov-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/urgent' into sh-latest
|
|
Revision tags: v2.6.37-rc4 |
|
| #
8d7ee9c4 |
| 29-Nov-2010 |
Greg Kroah-Hartman <gregkh@suse.de> |
Merge branch 'master' into work
|
| #
ca19e77e |
| 29-Nov-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
|
| #
1d6d7568 |
| 28-Nov-2010 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
| #
22a867d8 |
| 26-Nov-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.37-rc3' into sched/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
e4e91ac4 |
| 26-Nov-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.37-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
b03a6c4c |
| 24-Nov-2010 |
Chris Metcalf <cmetcalf@tilera.com> |
Merge branch 'master' into for-linus
|
| #
c4d73e7d |
| 24-Nov-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branches 'rmobile/ag5' and 'rmobile/fsi-despair' into rmobile-latest
|