summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/aes.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-10 16:10:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-10 16:10:33 -0800
commite54be894eae10eca9892e965cc9532f5d5a11767 (patch)
tree27ace4446e42058ef4813a34bf63b55a870e7a12 /arch/x86/include/asm/aes.h
parent949f6711b83d2809d1ccb9d830155a65fdacdff9 (diff)
parentc6c0ac664c86ff6408fadbed4913938c8a732e26 (diff)
downloadblackbird-op-linux-e54be894eae10eca9892e965cc9532f5d5a11767.tar.gz
blackbird-op-linux-e54be894eae10eca9892e965cc9532f5d5a11767.zip
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
Diffstat (limited to 'arch/x86/include/asm/aes.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud