diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-15 23:49:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-15 23:49:48 +0200 |
| commit | e6694d984adbe8146d2f1e08d500befc1481835e (patch) | |
| tree | 2bd08e6b4efd06c663e7b5bf9ea54e2dcb389b13 /drivers/net/bonding/bonding.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | Merge tag 'fixes-3.10-4' of git://git.infradead.org/users/jcooper/linux into ... (diff) | |
| download | linux-e6694d984adbe8146d2f1e08d500befc1481835e.tar.xz linux-e6694d984adbe8146d2f1e08d500befc1481835e.zip | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"These are a little later than I planned on since I got caught up with
handling merges for 3.11 most of the week.
Another week, another batch of fixes for arm-soc platforms.
Again, nothing controversial. A few more than would be ideal, but all
are valid fixes. In particular the prima2 panic patch is critical
since it fixes a problem where multiplatform kernels panic on all but
prima2 hardware."
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: SAMSUNG: pm: Adjust for pinctrl- and DT-enabled platforms
ARM: prima2: fix incorrect panic usage
arm: mvebu: armada-xp-{gp,openblocks-ax3-4}: specify PCIe range
ARM: Kirkwood: handle mv88f6282 cpu in __kirkwood_variant().
ARM: omap3: clock: fix wrong container_of in clock36xx.c
ARM: dts: OMAP5: Fix missing PWM capability to timer nodes
ARM: dts: omap4-panda|sdp: Fix mux for twl6030 IRQ pin and msecure line
ARM: dts: AM33xx: Fix properties on gpmc node
arm: omap2: fix AM33xx hwmod infos for UART2
ARM: OMAP3: Fix iva2_pwrdm settings for 3703
Diffstat (limited to 'drivers/net/bonding/bonding.h')
0 files changed, 0 insertions, 0 deletions