| #
f43dc23d |
| 13-Jan-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
Conflicts:
arch/sh/kernel/cpu/sh2/setup-sh7619.c
arch/sh/kernel/cpu/sh2a/setup-mxg
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
Conflicts:
arch/sh/kernel/cpu/sh2/setup-sh7619.c
arch/sh/kernel/cpu/sh2a/setup-mxg.c
arch/sh/kernel/cpu/sh2a/setup-sh7201.c
arch/sh/kernel/cpu/sh2a/setup-sh7203.c
arch/sh/kernel/cpu/sh2a/setup-sh7206.c
arch/sh/kernel/cpu/sh3/setup-sh7705.c
arch/sh/kernel/cpu/sh3/setup-sh770x.c
arch/sh/kernel/cpu/sh3/setup-sh7710.c
arch/sh/kernel/cpu/sh3/setup-sh7720.c
arch/sh/kernel/cpu/sh4/setup-sh4-202.c
arch/sh/kernel/cpu/sh4/setup-sh7750.c
arch/sh/kernel/cpu/sh4/setup-sh7760.c
arch/sh/kernel/cpu/sh4a/setup-sh7343.c
arch/sh/kernel/cpu/sh4a/setup-sh7366.c
arch/sh/kernel/cpu/sh4a/setup-sh7722.c
arch/sh/kernel/cpu/sh4a/setup-sh7723.c
arch/sh/kernel/cpu/sh4a/setup-sh7724.c
arch/sh/kernel/cpu/sh4a/setup-sh7763.c
arch/sh/kernel/cpu/sh4a/setup-sh7770.c
arch/sh/kernel/cpu/sh4a/setup-sh7780.c
arch/sh/kernel/cpu/sh4a/setup-sh7785.c
arch/sh/kernel/cpu/sh4a/setup-sh7786.c
arch/sh/kernel/cpu/sh4a/setup-shx3.c
arch/sh/kernel/cpu/sh5/setup-sh5.c
drivers/serial/sh-sci.c
drivers/serial/sh-sci.h
include/linux/serial_sci.h
show more ...
|
| #
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
|
| #
7ccbefe0 |
| 21-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
|
| #
ae09f09e |
| 21-Dec-2010 |
Dave Airlie <airlied@redhat.com> |
Merge remote branch 'intel/drm-intel-next' of /ssd/git/drm-next into drm-core-next
* 'intel/drm-intel-next' of /ssd/git/drm-next: (771 commits)
drm/i915: Undo "Uncouple render/power ctx before sus
Merge remote branch 'intel/drm-intel-next' of /ssd/git/drm-next into drm-core-next
* 'intel/drm-intel-next' of /ssd/git/drm-next: (771 commits)
drm/i915: Undo "Uncouple render/power ctx before suspending"
drm/i915: Allow the application to choose the constant addressing mode
drm/i915: dynamic render p-state support for Sandy Bridge
drm/i915: Enable EI mode for RCx decision making on Sandybridge
drm/i915/sdvo: Border and stall select became test bits in gen5
drm/i915: Add Guess-o-matic for pageflip timestamping.
drm/i915: Add support for precise vblank timestamping (v2)
drm/i915: Add frame buffer compression on Sandybridge
drm/i915: Add self-refresh support on Sandybridge
drm/i915: Wait for vblank before unpinning old fb
Revert "drm/i915: Avoid using PIPE_CONTROL on Ironlake"
drm/i915: Pass clock limits down to PLL matcher
drm/i915: Poll for seqno completion if IRQ is disabled
drm/i915/ringbuffer: Make IRQ refcnting atomic
agp/intel: Fix missed cached memory flags setting in i965_write_entry()
drm/i915/sdvo: Only use the SDVO pin if it is in the valid range
drm/i915: Enable RC6 autodownclocking on Sandybridge
drm/i915: Terminate the FORCE WAKE after we have finished reading
drm/i915/gtt: Clear the cachelines upon resume
drm/i915: Restore GTT mapping first upon resume
...
show more ...
|
|
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
|
| #
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
|
| #
8e9255e6 |
| 08-Dec-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/core
Merge reason: we want to queue up dependent cleanup
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
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 ...
|
| #
10a18d7d |
| 07-Dec-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.37-rc5' into perf/core
Merge reason: Pick up the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
|
Revision tags: v2.6.37-rc5 |
|
| #
0e44e059 |
| 06-Dec-2010 |
Sascha Hauer <s.hauer@pengutronix.de> |
Merge commit 'v2.6.37-rc4' into imx-for-2.6.38
Done to resolve merge conflict:
Conflicts:
arch/arm/mach-mx25/devices-imx25.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
|
| #
b9e68670 |
| 02-Dec-2010 |
Chris Wilson <chris@chris-wilson.co.uk> |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/intel_drv.h
|
| #
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
|