diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-18 07:38:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-18 07:38:19 -0800 |
| commit | 5cbb0601bfddfc55d6ea409651313c13e3d6e90a (patch) | |
| tree | bf1216e41d30f1c2d8eea631945ef8efeb74ad56 /fs/nilfs2 | |
| parent | 2d5bc23b32e0ec6fe9c1cdd9f371063881dc1ffc (diff) | |
| parent | 648f15345add88a7eea724365fe1217a8d8a1e16 (diff) | |
Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fixup last users of irq_chip->typename
uio: pm_runtime_disable is needed if failed
Diffstat (limited to 'fs/nilfs2')
0 files changed, 0 insertions, 0 deletions