linux/drivers/net/can
Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
c_can can: c_can: remove duplicated #include 2011-07-23 20:01:15 -07:00
mscan drivercore: revert addition of of_match to struct device 2011-05-18 12:32:23 -06:00
sja1000 net: include io.h in sja1000_of_platform.c for iounmap etc 2011-06-29 02:55:28 -07:00
softing Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-07-25 13:56:39 -07:00
usb Fix common misspellings 2011-03-31 11:26:23 -03:00
at91_can.c can: at91_can: add support for the AT91SAM9X5 SOCs 2011-06-06 14:50:57 +02:00
bfin_can.c can: bfin_can: auto-calculate accessor sizes 2011-06-27 20:42:24 -07:00
dev.c can: make function can_get_bittiming static 2011-07-21 20:39:47 -07:00
flexcan.c drivers/net/can/flexcan.c: add missing clk_put 2011-06-02 00:10:01 -07:00
janz-ican3.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
Kconfig Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-07-05 23:23:37 -07:00
Makefile can: c_can: Added support for Bosch C_CAN controller 2011-02-13 22:51:44 -08:00
mcp251x.c can: mcp251x: Allow pass IRQ flags through platform data. 2011-04-06 12:24:26 -07:00
pch_can.c treewide: fix a few typos in comments 2011-05-10 10:16:21 +02:00
slcan.c slcan: remove unused 'leased', 'line' and 'pid' fields from the 'slcan' structure 2011-07-19 16:55:42 -07:00
ti_hecc.c Fix common misspellings 2011-03-31 11:26:23 -03:00
vcan.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00