diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 10:05:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 10:05:23 -0700 |
| commit | 6d1e9a42e7176bbce9348274784b2e5f69223936 (patch) | |
| tree | 628404d7cffd7ac8ab6629cf5052e21d50e86633 /drivers/block/floppy.c | |
| parent | 95985725367e55642755ca6986d0c930cd3738e2 (diff) | |
| parent | 7415982732bcb30100582cff8d2aca12a55123b4 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
pstore: cleanups to pstore_dump()
[IA64] New syscalls for 2.6.39
Diffstat (limited to 'drivers/block/floppy.c')
0 files changed, 0 insertions, 0 deletions