git.karo-electronics.de Git - karo-tx-linux.git/log

Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
arch/arm/mach-mx5/mm.c
arch/arm/plat-mxc/include/mach/hardware.h

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:59:54 +0000 (10:59 +1100)]

Merge remote-tracking branch 'at91/at91-next'

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:58:34 +0000 (10:58 +1100)]

Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:57:14 +0000 (10:57 +1100)]

Merge remote-tracking branch 'arm/for-next'

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:51:10 +0000 (10:51 +1100)]

Merge remote-tracking branch 'ide/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:50:56 +0000 (10:50 +1100)]

Merge remote-tracking branch 'input-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:50:55 +0000 (10:50 +1100)]

Merge remote-tracking branch 'char-misc.current/char-misc-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:50:54 +0000 (10:50 +1100)]

Merge remote-tracking branch 'usb.current/usb-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:50:53 +0000 (10:50 +1100)]

Merge remote-tracking branch 'tty.current/tty-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:50:52 +0000 (10:50 +1100)]

Merge remote-tracking branch 'driver-core.current/driver-core-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:50:50 +0000 (10:50 +1100)]

Merge remote-tracking branch 'wireless/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:50:47 +0000 (10:50 +1100)]

Merge remote-tracking branch 'pci-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:50:46 +0000 (10:50 +1100)]

Merge remote-tracking branch 'sound-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:50:45 +0000 (10:50 +1100)]

Merge remote-tracking branch 'net/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:50:44 +0000 (10:50 +1100)]

Merge remote-tracking branch 'scsi-rc-fixes/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:50:44 +0000 (10:50 +1100)]

Merge remote-tracking branch 'sparc/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 16 Nov 2011 23:50:41 +0000 (10:50 +1100)]

Merge remote-tracking branch 'arm-current/fixes'

commit | commitdiff | tree

Jean Delvare [Wed, 16 Nov 2011 23:43:22 +0000 (10:43 +1100)]

i2c: Delete ANY_I2C_BUS

Last piece of code using ANY_I2C_BUS was deleted almost 2 years ago,
so ANY_I2C_BUS can go away as well.

Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit | commitdiff | tree

Jean Delvare [Wed, 16 Nov 2011 23:43:22 +0000 (10:43 +1100)]

i2c: Fix device name for 10-bit slave address

10-bit addresses overlap with traditional 7-bit addresses, leading in
device name collisions. Add an arbitrary offset to 10-bit addresses to
prevent this collision. The offset was chosen so that the address is
still easily recognizable.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>

commit | commitdiff | tree

Jeffrey (Sheng-Hui) Chu [Wed, 16 Nov 2011 23:43:20 +0000 (10:43 +1100)]

i2c-algo-bit: Generate correct i2c address sequence for 10-bit target

The wrong bits were put on the wire, fix that.

This fixes kernel bug #42562.

Signed-off-by: Sheng-Hui J. Chu <jeffchu@broadcom.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

commit | commitdiff | tree

James Morris [Wed, 16 Nov 2011 23:08:37 +0000 (10:08 +1100)]

Merge branch 'for-james' of git://github.com/srajiv/tpm into next

commit | commitdiff | tree

Padmanabh Ratnakar [Wed, 16 Nov 2011 02:03:45 +0000 (02:03 +0000)]

be2net: Use V1 query link status command for lancer

Use V1 version of query link status command for Lancer.

Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Padmanabh Ratnakar [Wed, 16 Nov 2011 02:03:32 +0000 (02:03 +0000)]

be2net: Fix VLAN promiscous mode for Lancer

To enable VLAN promiscous mode, the HW interface should be created
with VLAN promiscous capability in Lancer. Add this capability during
creation of the HW interface.

Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Padmanabh Ratnakar [Wed, 16 Nov 2011 02:03:07 +0000 (02:03 +0000)]

be2net: Add EEPROM dump feature for Lancer

Implemented eeprom dump using ethtool feature for Lancer.

Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Padmanabh Ratnakar [Wed, 16 Nov 2011 02:02:43 +0000 (02:02 +0000)]

be2net: add register dump feature for Lancer

Implement register dump using ethtool for Lancer.

Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Padmanabh Ratnakar [Wed, 16 Nov 2011 02:02:23 +0000 (02:02 +0000)]

be2net: Fix TX queue create for Lancer

Lancer uses V1 version of TXQ create. This command needs interface
id for TX queue creation. Rearrange code such that tx queue create
is after interface create. As TXQ create is now called after MCC
ring create use MCC instead of MBOX.

Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

David S. Miller [Wed, 16 Nov 2011 23:05:50 +0000 (18:05 -0500)]

infiniband: Update net drivers for netdev_features_t changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Rafael J. Wysocki [Wed, 16 Nov 2011 23:02:38 +0000 (00:02 +0100)]

PM Sleep: Do not extend wakeup paths to devices with ignore_children set

Commit 4ca46ff3e0d8c234cb40ebb6457653b59584426c (PM / Sleep: Mark
devices involved in wakeup signaling during suspend) introduced
the power.wakeup_path field in struct dev_pm_info to mark devices
whose children are enabled to wake up the system from sleep states,
so that power domains containing the parents that provide their
children with wakeup power and/or relay their wakeup signals are not
turned off.  Unfortunately, that introduced a PM regression on SH7372
whose power consumption in the system "memory sleep" state increased
as a result of it, because it prevented the power domain containing
the I2C controller from being turned off when some children of that
controller were enabled to wake up the system, although the
controller was not necessary for them to signal wakeup.

To fix this issue use the observation that devices whose
power.ignore_children flag is set for runtime PM should be treated
analogously during system suspend.  Namely, they shouldn't be
included in wakeup paths going through their children.  Since the
SH7372 I2C controller's power.ignore_children flag is set, doing so
will restore the previous behavior of that SOC.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

commit | commitdiff | tree

Rafael J. Wysocki [Wed, 16 Nov 2011 23:02:16 +0000 (00:02 +0100)]

PM / shmobile: Fix build of sh7372_pm_init() for CONFIG_PM unset

Fix build regression introduced by commit 056879d2f244001b2888cdc8cf
(ARM: mach-shmobile: sh7372 A3SP no_suspend_console fix) by moving
the intialization of the A3SP domain to a separate function and
providing an empty definition of it for CONFIG_PM unset.

Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

commit | commitdiff | tree