summaryrefslogtreecommitdiffstats
path: root/block/elevator.c
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2010-05-10 15:08:11 -0700
committerReinette Chatre <reinette.chatre@intel.com>2010-05-10 15:08:11 -0700
commita15707d80ee9a0e0812c5f1a1ed8e41e0a6e52f3 (patch)
treeb1774dad1d72b70d88ab6c51ff4b87697dfca57a /block/elevator.c
parent9459d59fbf0bc82ff4c804679fa8bc22788eca63 (diff)
parent562db532760827f6ce30801a08e6b568848bc9f2 (diff)
downloadop-kernel-dev-a15707d80ee9a0e0812c5f1a1ed8e41e0a6e52f3.zip
op-kernel-dev-a15707d80ee9a0e0812c5f1a1ed8e41e0a6e52f3.tar.gz
Merge branch 'wireless-2.6' into wireless-next-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-dev.h
Diffstat (limited to 'block/elevator.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud