#
7acdbb3f |
| 23-Feb-2011 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into x86/platform
Reason: Import mainline device tree changes on which further patches depend on or conflict.
Trivial conflict in: drivers/spi/pxa2xx_spi_pci.c
Signed-
Merge branch 'linus' into x86/platform
Reason: Import mainline device tree changes on which further patches depend on or conflict.
Trivial conflict in: drivers/spi/pxa2xx_spi_pci.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
show more ...
|
#
695884fb |
| 22-Feb-2011 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform
Reason: x86 devicetree support for ce4100 depends on those device tree changes scheduled for .39.
Signed
Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform
Reason: x86 devicetree support for ce4100 depends on those device tree changes scheduled for .39.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
show more ...
|
#
710f9578 |
| 22-Feb-2011 |
Chris Wilson <chris@chris-wilson.co.uk> |
Merge branch 'drm-intel-fixes' into drm-intel-next
Merge in the conflicting eDP fix.
Conflicts: drivers/gpu/drm/i915/i915_irq.c drivers/gpu/drm/i915/intel_display.c
Signed-off-by: Chris Wilson <
Merge branch 'drm-intel-fixes' into drm-intel-next
Merge in the conflicting eDP fix.
Conflicts: drivers/gpu/drm/i915/i915_irq.c drivers/gpu/drm/i915/intel_display.c
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
show more ...
|
Revision tags: v2.6.38-rc6 |
|
#
43d133c1 |
| 21-Feb-2011 |
Tejun Heo <tj@kernel.org> |
Merge branch 'master' into for-2.6.39
|
#
da935c66 |
| 20-Feb-2011 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: Documentation/feature-removal-schedule.txt drivers/net/e1000e/netdev.c net/xfrm/xfrm_policy.c
|
#
218502bf |
| 19-Feb-2011 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'irq/urgent' into irq/core
Reason: Further patches are conflicting with mainline fixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
#
4c3021da |
| 18-Feb-2011 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (37 commits) net: deinit automatic LIST_HEAD net: dont leave acti
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (37 commits) net: deinit automatic LIST_HEAD net: dont leave active on stack LIST_HEAD net: provide default_advmss() methods to blackhole dst_ops tg3: Restrict phy ioctl access drivers/net: Call netif_carrier_off at the end of the probe ixgbe: work around for DDP last buffer size ixgbe: fix panic due to uninitialised pointer e1000e: flush all writebacks before unload e1000e: check down flag in tasks isdn: hisax: Use l2headersize() instead of dup (and buggy) func. arp_notify: unconditionally send gratuitous ARP for NETDEV_NOTIFY_PEERS. cxgb4vf: Use defined Mailbox Timeout cxgb4vf: Quiesce Virtual Interfaces on shutdown ... cxgb4vf: Behave properly when CONFIG_DEBUG_FS isn't defined ... cxgb4vf: Check driver parameters in the right place ... pch_gbe: Fix the MAC Address load issue. iwlwifi: Delete iwl3945_good_plcp_health. net/can/softing: make CAN_SOFTING_CS depend on CAN_SOFTING netfilter: nf_iterate: fix incorrect RCU usage pch_gbe: Fix the issue that the receiving data is not normal. ...
show more ...
|
#
80ae3fa5 |
| 18-Feb-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Merge 2.6.38-rc5 into staging-next
This is to resolve a merge conflict with: drivers/staging/zram/zram_drv.c as pointed out by Stephen Rothwell
Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Niti
Merge 2.6.38-rc5 into staging-next
This is to resolve a merge conflict with: drivers/staging/zram/zram_drv.c as pointed out by Stephen Rothwell
Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Nitin Gupta <ngupta@vflare.org> Cc: Robert Jennings <rcj@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
#
66b0835e |
| 17-Feb-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Merge 2.6.38-rc5 into usb-next
This is needed to resolve some merge conflicts that were found in the USB host controller patches, and reported by Stephen Rothwell.
Signed-off-by: Greg Kroah-Hartman
Merge 2.6.38-rc5 into usb-next
This is needed to resolve some merge conflicts that were found in the USB host controller patches, and reported by Stephen Rothwell.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
#
a3ec4a60 |
| 16-Feb-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.38-rc5' into core/locking
Merge reason: pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
48fa4b8e |
| 16-Feb-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.38-rc5' into sched/core
Merge reason: Pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
9035a97a |
| 16-Feb-2011 |
Chris Wilson <chris@chris-wilson.co.uk> |
Merge branch 'drm-intel-fixes' into drm-intel-next
Grab the latest stabilisation bits from -fixes and some suspend and resume fixes from linus.
Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/
Merge branch 'drm-intel-fixes' into drm-intel-next
Grab the latest stabilisation bits from -fixes and some suspend and resume fixes from linus.
Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_irq.c
show more ...
|
Revision tags: v2.6.38-rc5 |
|
#
0a9d59a2 |
| 15-Feb-2011 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
|
#
18e95502 |
| 15-Feb-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/st-integration' into sh-latest
|
#
d60cf53a |
| 15-Feb-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/st-integration' into sh/urgent
|
#
ddfdb508 |
| 14-Feb-2011 |
Kurt Van Dijck <kurt.van.dijck@eia.be> |
net/can/softing: make CAN_SOFTING_CS depend on CAN_SOFTING
The statement 'select CAN_SOFTING' may ignore the dependancies for CAN_SOFTING while selecting CAN_SOFTING_CS, as is therefore a bad choice
net/can/softing: make CAN_SOFTING_CS depend on CAN_SOFTING
The statement 'select CAN_SOFTING' may ignore the dependancies for CAN_SOFTING while selecting CAN_SOFTING_CS, as is therefore a bad choice.
Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
#
b214b7bb |
| 14-Feb-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.38-rc4' into spi/next
|
#
b366801c |
| 14-Feb-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.38-rc4' into x86/numa
Merge reason: Merge latest fixes before applying new patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
91e04ec0 |
| 14-Feb-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.38-rc4' into x86/cpu
Merge reason: pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
d2137d5a |
| 14-Feb-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/bootmem
Conflicts: arch/x86/mm/numa_64.c
Merge reason: fix the conflict, update to latest -rc and pick up this dependent fix from Yinghai:
e6d2e2b2b1
Merge branch 'linus' into x86/bootmem
Conflicts: arch/x86/mm/numa_64.c
Merge reason: fix the conflict, update to latest -rc and pick up this dependent fix from Yinghai:
e6d2e2b2b1e1: memblock: don't adjust size in memblock_find_base()
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
#
f19693a1 |
| 11-Feb-2011 |
Sascha Hauer <s.hauer@pengutronix.de> |
Merge commit 'v2.6.38-rc4' into imx-for-2.6.39
Conflicts: arch/arm/mach-mxs/clock-mx28.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
|
Revision tags: v2.6.38-rc4 |
|
#
c7f9a6f3 |
| 07-Feb-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into perf/core
Merge reason: Pick up perf fixes that are now upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
285c1a2c |
| 05-Feb-2011 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'irq/urgent' into irq/core
Reason: Get mainline fixes integrated. Further patches conflict with them
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
#
bd4a6974 |
| 04-Feb-2011 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
|
#
44f2c5c8 |
| 04-Feb-2011 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (68 commits) net: can: janz-ican3: world-writable sysfs termination
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (68 commits) net: can: janz-ican3: world-writable sysfs termination file net: can: at91_can: world-writable sysfs files MAINTAINERS: update email ids of the be2net driver maintainers. bridge: Don't put partly initialized fdb into hash r8169: prevent RxFIFO induced loops in the irq handler. r8169: RxFIFO overflow oddities with 8168 chipsets. r8169: use RxFIFO overflow workaround for 8168c chipset. include/net/genetlink.h: Allow genlmsg_cancel to accept a NULL argument net: Provide compat support for SIOCGETMIFCNT_IN6 and SIOCGETSGCNT_IN6. net: Support compat SIOCGETVIFCNT ioctl in ipv4. net: Fix bug in compat SIOCGETSGCNT handling. niu: Fix races between up/down and get_stats. tcp_ecn is an integer not a boolean atl1c: Add missing PCI device ID s390: Fix possibly wrong size in strncmp (smsgiucv) s390: Fix wrong size in memcmp (netiucv) qeth: allow OSA CHPARM change in suspend state qeth: allow HiperSockets framesize change in suspend qeth: add more strict MTU checking qeth: show new mac-address if its setting fails ...
show more ...
|