diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 20:23:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 20:23:16 -0400 |
| commit | 577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d (patch) | |
| tree | 8b3d6902494dcf3d872ce7e47ebe38846f0d8895 /net/bluetooth/hci_sock.c | |
| parent | 7111de76438e05ceab8ba2a471192fa3ea6c3572 (diff) | |
| parent | e535e2efd295c3990bb9f654c8bb6bd176ebdc2b (diff) | |
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:
ocfs2: Fix calculation of i_blocks during truncate
[PATCH] ocfs2: Fix a wrong cluster calculation.
[PATCH] ocfs2: fix mount option parsing
ocfs2: update docs for new features
Diffstat (limited to 'net/bluetooth/hci_sock.c')
0 files changed, 0 insertions, 0 deletions