summaryrefslogtreecommitdiff
path: root/net/mpls/mpls_gso.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-11-20 18:14:47 +0100
committerArnd Bergmann <arnd@arndb.de>2014-11-20 18:14:47 +0100
commit594b732110194e1ba1f2dac674b006d5278e99c9 (patch)
treeb127ed49ff86e79d1cd4b132e42ba8abcdb73471 /net/mpls/mpls_gso.c
parent0233903e40b9f45220976f684ad2b87e7dbfcfee (diff)
parent6f8782a7a1c826e1c013d6b7d5504af6bcc079e6 (diff)
Merge tag 'omap-for-v3.19/gpmc-timings' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/omap-gpmc
Pull "omap gpmc changes for v3.19" from Tony Lindgren: GPMC (General Purpose Memory Controller) changes for omaps. These changes allow us to drop dependencies to bootloader timings now that the known device tree entries have been fixed. So we can now require proper timings to be configured and get rid of the legacy smsc91x code. Note that this branch has a dependency to the related device tree branch sent in a separate pull request as timings are now required. * tag 'omap-for-v3.19/gpmc-timings' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Remove unnecesary include in GPMC driver ARM: OMAP2+: Drop legacy code for gpmc-smc91x.c ARM: OMAP2+: Require proper GPMC timings for devices ARM: OMAP2+: Show bootloader GPMC timings to allow configuring the .dts file ARM: OMAP2+: Fix support for multiple devices on a GPMC chip select ARM: OMAP2+: gpmc: Sanity check GPMC fck on probe ARM: OMAP2+: gpmc: Keep Chip Select disabled while configuring it ARM: OMAP2+: gpmc: Always enable A26-A11 for non NAND devices ARM: OMAP2+: gpmc: Error out if timings fail in gpmc_probe_generic_child() ARM: OMAP2+: gpmc: Print error message in set_gpmc_timing_reg() Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/mpls/mpls_gso.c')
0 files changed, 0 insertions, 0 deletions