| #
eed0ba0b |
| 10-Jan-2011 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge remote branch 'gcl/next' into next
|
| #
20c040ce |
| 10-Jan-2011 |
Michal Simek <monstr@monstr.eu> |
Merge commit 'v2.6.37' into next
|
| #
acc6f112 |
| 09-Jan-2011 |
Steve French <sfrench@us.ibm.com> |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/dir.c
|
| #
d2e7ad19 |
| 09-Jan-2011 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
Conflicts:
security/smack/smack_lsm.c
Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>
Signed-off
Merge branch 'master' into next
Conflicts:
security/smack/smack_lsm.c
Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: James Morris <jmorris@namei.org>
show more ...
|
| #
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 ...
|
| #
5e93c6b4 |
| 06-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 rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
|
| #
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
|
| #
abb35945 |
| 06-Jan-2011 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1436 commits)
cassini: Use local-mac-address prom proper
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1436 commits)
cassini: Use local-mac-address prom property for Cassini MAC address
net: remove the duplicate #ifdef __KERNEL__
net: bridge: check the length of skb after nf_bridge_maybe_copy_header()
netconsole: clarify stopping message
netconsole: don't announce stopping if nothing happened
cnic: Fix the type field in SPQ messages
netfilter: fix export secctx error handling
netfilter: fix the race when initializing nf_ct_expect_hash_rnd
ipv4: IP defragmentation must be ECN aware
net: r6040: Return proper error for r6040_init_one
dcb: use after free in dcb_flushapp()
dcb: unlock on error in dcbnl_ieee_get()
net: ixp4xx_eth: Return proper error for eth_init_one
include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan local tunnel
net: add POLLPRI to sock_def_readable()
af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks.
net_sched: pfifo_head_drop problem
mac80211: remove stray extern
mac80211: implement off-channel TX using hw r-o-c offload
mac80211: implement hardware offload for remain-on-channel
...
show more ...
|
|
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 |
|
| #
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 |
|
| #
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>
|
| #
2f841ed1 |
| 18-Dec-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'hw-breakpoint' of git://repo.or.cz/linux-2.6/linux-wd into devel-stable
|
| #
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 |
|
| #
8990c1bc |
| 14-Dec-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.37-rc1' into kbuild/kbuild
|
| #
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
|
| #
c43328e8 |
| 13-Dec-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branches 'sh/urgent' and 'sh/rsk-updates' into sh-latest
|
| #
2ade0c1d |
| 10-Dec-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into upstream
|