diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-05 11:56:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-05 11:56:55 -0700 |
| commit | 5b1755f23b98e0afaedaec8344002ab184646286 (patch) | |
| tree | fa8fd1a0a68335c7b3bc1b8e1bc26a1117c82f4e /drivers/ide/ide-dma-sff.c | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
| parent | c84b564e82777b00ab48178a88bc533ba62b9922 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: fix rename of pt_regs offset defines breakage
m68knommu: remove duplicated #include
m68knommu: show KiB rather than pages in "Freeing initrd memory:" message
Diffstat (limited to 'drivers/ide/ide-dma-sff.c')
0 files changed, 0 insertions, 0 deletions