diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 18:02:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 18:02:43 -0800 |
| commit | 5ee354a0295c34aa7da07be8490f86edee2c7883 (patch) | |
| tree | 9ceeba4179d48f0ca7b31a4d2b5a7f1d60df5ecb /fs/ocfs2/journal.c | |
| parent | c77417132c12af338a7d37956809b2b98d20413c (diff) | |
| parent | a4b1d1b3619ee2fac40cdf5ca86a4758e45b9358 (diff) | |
Merge branch 'misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
* 'misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64: pcibr: Use kmemdup rather than duplicating its implementation
ia64: sn: Use kmemdup rather than duplicating its implementation
ia64: tioca: Use kmemdup rather than duplicating its implementation
[IA64] Merge overlapping reserved regions at boot
Diffstat (limited to 'fs/ocfs2/journal.c')
0 files changed, 0 insertions, 0 deletions