From: Olof Johansson <olof@lixom.net>
Date: Sun, 29 Dec 2013 03:40:42 +0000 (-0800)
Subject: Merge branch 'fixes' into for-next
X-Git-Tag: next-20140106~110^2~25
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c22d24f1459efe1d72b6d5a3981404769d77d251;p=karo-tx-linux.git

Merge branch 'fixes' into for-next

* fixes: (230 commits)
  ARM: pxa: fix USB gadget driver compilation regression
  ARM: OMAP2+: Fix LCD panel backlight regression for LDP legacy booting
  ARM: OMAP2+: hwmod_data: fix missing OMAP_INTC_START in irq data
  ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL
  Linux 3.13-rc5
  aio: clean up and fix aio_setup_ring page mapping
  aio/migratepages: make aio migrate pages sane
  aio: fix kioctx leak introduced by "aio: Fix a trinity splat"
  Don't set the INITRD_COMPRESS environment variable automatically
  mm: fix build of split ptlock code
  pstore: Don't allow high traffic options on fragile devices
  mm: do not allocate page->ptl dynamically, if spinlock_t fits to long
  mm: page_alloc: revert NUMA aspect of fair allocation policy
  Revert "mm: page_alloc: exclude unreclaimable allocations from zone fairness policy"
  mm: Fix NULL pointer dereference in madvise(MADV_WILLNEED) support
  qla2xxx: Fix scsi_host leak on qlt_lport_register callback failure
  target: Remove extra percpu_ref_init
  arm64: ptrace: avoid using HW_BREAKPOINT_EMPTY for disabled events
  ARC: Allow conditional multiple inclusion of uapi/asm/unistd.h
  ARM: shmobile: r8a7790: fix shdi resource sizes
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
---

c22d24f1459efe1d72b6d5a3981404769d77d251
diff --cc arch/arm/boot/dts/r8a7790.dtsi
index 68b7b87e535f,9987dd0e9c59..c6001032d9a7
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@@ -252,20 -239,20 +252,20 @@@
  		reg = <0 0xe6060000 0 0x250>;
  	};
  
 -	sdhi0: sdhi@ee100000 {
 +	sdhi0: sd@ee100000 {
  		compatible = "renesas,sdhi-r8a7790";
- 		reg = <0 0xee100000 0 0x100>;
+ 		reg = <0 0xee100000 0 0x200>;
  		interrupt-parent = <&gic>;
 -		interrupts = <0 165 4>;
 +		interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
  		cap-sd-highspeed;
  		status = "disabled";
  	};
  
 -	sdhi1: sdhi@ee120000 {
 +	sdhi1: sd@ee120000 {
  		compatible = "renesas,sdhi-r8a7790";
- 		reg = <0 0xee120000 0 0x100>;
+ 		reg = <0 0xee120000 0 0x200>;
  		interrupt-parent = <&gic>;
 -		interrupts = <0 166 4>;
 +		interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
  		cap-sd-highspeed;
  		status = "disabled";
  	};