summaryrefslogtreecommitdiffstats
path: root/arch/ia64/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-12 13:17:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-12 13:17:12 -0700
commitc53567ad4528b6efefc3fc22a354d20f6226a098 (patch)
treefaa289a41715e0a9a174623a76c7d52b10d4a6df /arch/ia64/pci
parent4ddbac98980fe0a42cf57af5d1032e024aced6a1 (diff)
parent748285ccf7ea76d3d76d0d5f2945ad6fb91f5329 (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: use more NOFS allocation dlm: connect to nodes earlier dlm: fix use count with multiple joins dlm: Make name input parameter of {,dlm_}new_lockspace() const
Diffstat (limited to 'arch/ia64/pci')
0 files changed, 0 insertions, 0 deletions