OpenCloudOS-Kernel/drivers/net/atl1c
Linus Torvalds e16b396ce3 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: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)
2011-03-18 10:37:40 -07:00
..
Makefile atl1c: Atheros L1C Gigabit Ethernet driver 2009-02-18 17:24:15 -08:00
atl1c.h Comment typo fixes for 'descriptor' 2011-01-19 15:37:19 +01:00
atl1c_ethtool.c drivers/net: Remove unnecessary returns from void function()s 2010-05-14 00:19:28 -07:00
atl1c_hw.c atl1c: remove private #define. 2011-01-20 16:50:05 -08:00
atl1c_hw.h atl1c: remove private #define. 2011-01-20 16:50:05 -08:00
atl1c_main.c atl1[ce]: fix sparse warnings 2011-02-23 14:11:31 -08:00