diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-03 00:28:45 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-03 00:28:45 +0200 |
commit | 28928b2f1d769abdc173c96e2632d30cbde9ec4a (patch) | |
tree | 2b5af75aba6c6ca2d5130fb8dcf027f282ed07ff /net/bluetooth/rfcomm | |
parent | mmc_spi: mmc_spi.h should include linux/interrupts.h (diff) | |
parent | [PATCH 3/3] ocfs2/net: Silence build warnings (diff) | |
download | linux-28928b2f1d769abdc173c96e2632d30cbde9ec4a.tar.xz linux-28928b2f1d769abdc173c96e2632d30cbde9ec4a.zip |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
[PATCH 3/3] ocfs2/net: Silence build warnings
[PATCH 2/3] ocfs2/dlm: Silence build warnings
[PATCH 1/3] ocfs2/net: Silence build warnings
ocfs2: Rename 'user_stack' plugin structure to 'ocfs2_user_plugin'
Diffstat (limited to 'net/bluetooth/rfcomm')
0 files changed, 0 insertions, 0 deletions