linux.git/arch, branch v3.1-rc6

Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc

2011-09-12T18:51:35+00:00

* 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
  ARM: CSR: add missing sentinels to of_device_id tables
  ARM: cns3xxx: Fix newly introduced warnings in the PCIe code
  ARM: cns3xxx: Fix compile error caused by hardware.h removed
  ARM: davinci: fix cache flush build error
  ARM: davinci: correct MDSTAT_STATE_MASK
  ARM: davinci: da850 EVM: read mac address from SPI flash
  OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers
  OMAP2430: hwmod: musb: add missing terminator to omap2430_usbhsotg_addrs[]
  OMAP3: clock: indicate that gpt12_fck and wdt1_fck are in the WKUP clockdomain
  OMAP4: clock: fix compile warning
  OMAP4: clock: re-enable previous clockdomain enable/disable sequence
  OMAP: clockdomain: Wait for powerdomain to be ON when using clockdomain force wakeup
  OMAP: powerdomains: Make all powerdomain target states as ON at init

Merge branch 'for_3.1/pm-fixes-2' of git://gitorious.org/khilman/linux-omap-pm into fixes

2011-09-12T18:30:22+00:00

Merge branch 'sirf/fixes' into fixes

2011-09-12T14:59:37+00:00

Merge branch 'for-linus' of git://openrisc.net/~jonas/linux

2011-09-11T21:55:43+00:00

* 'for-linus' of git://openrisc.net/~jonas/linux:
  Add missing DMA ops
  openrisc: don't use pt_regs in struct sigcontext

Add missing DMA ops

2011-09-11T07:50:39+00:00

For the initial architecture submission, not all of the DMA ops were
implemented.  This patch adds the *map_page and *map_sg variants of the
DMA mapping ops.

This patch is currently of interest mainly to some drivers that haven't
been submitted upstream yet.

Signed-off-by: Jonas Bonn

ARM: CSR: add missing sentinels to of_device_id tables

2011-09-11T01:11:26+00:00

The of_device_id tables used for matching should be terminated with
empty sentinel values.

Signed-off-by: Jamie Iles 
Signed-off-by: Barry Song

Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-09-11T00:28:46+00:00

* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  ARM: 7088/1: entry: fix wrong parameter name used in do_thumb_abort
  ARM: 7080/1: l2x0: make sure I&D are not locked down on init
  ARM: 7081/1: mach-integrator: fix the clocksource
  NET: am79c961: fix race in link status code
  ARM: 7067/1: mm: keep significant bits in pfn_valid

ARM: 7088/1: entry: fix wrong parameter name used in do_thumb_abort

2011-09-10T22:39:56+00:00

Commit be020f8618ca, "ARM: entry: abort-macro: specify registers to be
used for macros", while replacing register numbers with macro parameter
names, mismatched the name used for r1. For me, this resulted in user
space built for EABI with -march=armv4t -mtune=arm920t -mthumb-interwork
-mthumb broken on my OMAP1510 based Amstrad Delta (old ABI and no thumb
still worked for me though).

Fix this by using correct parameter name fsr instead of mismatched psr,
used by callers for another purpose.

Signed-off-by: Janusz Krzysztofik 
Signed-off-by: Russell King

Merge branches 'cns3xxx/fixes', 'omap/fixes' and 'davinci/fixes' into fixes

2011-09-10T21:20:25+00:00

Fix pointer dereference before call to pcie_bus_configure_settings

2011-09-10T02:49:58+00:00

Commit b03e7495a862 ("PCI: Set PCI-E Max Payload Size on fabric")
introduced a potential NULL pointer dereference in calls to
pcie_bus_configure_settings due to attempts to access pci_bus self
variables when the self pointer is NULL.

To correct this, verify that the self pointer in pci_bus is non-NULL
before dereferencing it.

Reported-by: Stanislaw Gruszka 
Signed-off-by: Shyam Iyer 
Signed-off-by: Jon Mason 
Acked-by: Jesse Barnes 
Signed-off-by: Linus Torvalds