diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 13:16:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 13:16:07 -0700 |
| commit | 6aaf4404ab2efff2f2f3ee4a5bb5379c1c8092b3 (patch) | |
| tree | e1108192285784cbdb6974d9c8791c1aa7cef77d /include/linux/mmc/ioctl.h | |
| parent | ba1f9db908a9ac4038f6b694de3e55959886258d (diff) | |
| parent | 10d1459fafbb02a18e7bc8f2c384a9e973560b00 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: don't limit active work items
dlm: use workqueue for callbacks
dlm: remove deadlock debug print
dlm: improve rsb searches
dlm: keep lkbs in idr
dlm: fix kmalloc args
dlm: don't do pointless NULL check, use kzalloc and fix order of arguments
dlm: dump address of unknown node
dlm: use vmalloc for hash tables
dlm: show addresses in configfs
Diffstat (limited to 'include/linux/mmc/ioctl.h')
0 files changed, 0 insertions, 0 deletions