]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/net/wireless/ath/carl9170/mac.c
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Jan 2011 00:10:33 +0000 (16:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Jan 2011 00:10:33 +0000 (16:10 -0800)
commite54be894eae10eca9892e965cc9532f5d5a11767
tree27ace4446e42058ef4813a34bf63b55a870e7a12
parent949f6711b83d2809d1ccb9d830155a65fdacdff9
parentc6c0ac664c86ff6408fadbed4913938c8a732e26
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  driver core: Document that device_rename() is only for networking
  sysfs: remove useless test from sysfs_merge_group
  driver-core: merge private parts of class and bus
  driver core: fix whitespace in class_attr_string
drivers/base/core.c
include/linux/device.h