diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 08:24:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 08:24:47 -0800 |
| commit | 6895210e89df20520916c94a4dc148a43229053e (patch) | |
| tree | 60b137cccd4a57bb98bbfed55a42859e4b60c8db /fs/ocfs2/inode.c | |
| parent | 4c10c937cc2eb197db565392db91d429eec71176 (diff) | |
| parent | 8a4fd1e4922413cfdfa6c51a59efb720d904a5eb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Make prom entry spinlock NMI safe.
sparc64: Kill off old sys_perfctr system call and state.
sparc: Update defconfigs.
sparc: Provide io{read,write}{16,32}be().
Diffstat (limited to 'fs/ocfs2/inode.c')
0 files changed, 0 insertions, 0 deletions