dect
/
linux-2.6
Archived
13
0
Fork 0
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/drivers/net/ethernet/intel/e1000e
Linus Torvalds 9f3938346a Merge branch 'kmap_atomic' of git://github.com/congwang/linux
Pull kmap_atomic cleanup from Cong Wang.

It's been in -next for a long time, and it gets rid of the (no longer
used) second argument to k[un]map_atomic().

Fix up a few trivial conflicts in various drivers, and do an "evil
merge" to catch some new uses that have come in since Cong's tree.

* 'kmap_atomic' of git://github.com/congwang/linux: (59 commits)
  feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal
  highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]
  drbd: remove the second argument of k[un]map_atomic()
  zcache: remove the second argument of k[un]map_atomic()
  gma500: remove the second argument of k[un]map_atomic()
  dm: remove the second argument of k[un]map_atomic()
  tomoyo: remove the second argument of k[un]map_atomic()
  sunrpc: remove the second argument of k[un]map_atomic()
  rds: remove the second argument of k[un]map_atomic()
  net: remove the second argument of k[un]map_atomic()
  mm: remove the second argument of k[un]map_atomic()
  lib: remove the second argument of k[un]map_atomic()
  power: remove the second argument of k[un]map_atomic()
  kdb: remove the second argument of k[un]map_atomic()
  udf: remove the second argument of k[un]map_atomic()
  ubifs: remove the second argument of k[un]map_atomic()
  squashfs: remove the second argument of k[un]map_atomic()
  reiserfs: remove the second argument of k[un]map_atomic()
  ocfs2: remove the second argument of k[un]map_atomic()
  ntfs: remove the second argument of k[un]map_atomic()
  ...
2012-03-21 09:40:26 -07:00
..
80003es2lan.c e1000e: rename e1000e_reload_nvm() and call as function pointer 2012-02-24 21:43:21 -08:00
82571.c e1000e: cleanup whitespace and indentation 2012-02-29 23:12:45 -08:00
Makefile e1000e: update copyright year 2012-01-26 19:01:17 -08:00
defines.h e1000e: Support RXALL feature flag. 2012-02-24 01:44:50 -08:00
e1000.h e1000e: rename e1000e_reload_nvm() and call as function pointer 2012-02-24 21:43:21 -08:00
ethtool.c e1000e: cleanup use of check_reset_block function pointer 2012-02-24 21:36:53 -08:00
hw.h e1000e: rename e1000e_reload_nvm() and call as function pointer 2012-02-24 21:43:21 -08:00
ich8lan.c e1000e: cleanup whitespace and indentation 2012-02-29 23:12:45 -08:00
mac.c e1000e: cleanup whitespace and indentation 2012-02-29 23:12:45 -08:00
manage.c e1000e: cleanup use of check_mng_mode function pointer 2012-02-24 21:35:53 -08:00
netdev.c Merge branch 'kmap_atomic' of git://github.com/congwang/linux 2012-03-21 09:40:26 -07:00
nvm.c e1000e: rename e1000e_reload_nvm() and call as function pointer 2012-02-24 21:43:21 -08:00
param.c e1000e: Support RXFCS feature flag. 2012-02-24 01:23:06 -08:00
phy.c e1000e: use msleep instead of mdelay 2012-02-29 23:14:19 -08:00