diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 16:27:10 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 16:27:10 (GMT) |
| commit | 6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8 (patch) | |
| tree | 33e4072d5539741e775788eb7dd0ffcf84208d3b /fs/squashfs | |
| parent | d9f5d41569731189e519fcee8578fcef5c916978 (diff) | |
| parent | 5e1c53356d79591b10cdea12e3d5ebace8e7b6fa (diff) | |
| download | linux-fsl-qoriq-6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8.tar.xz | |
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: include sched.h in ColdFire/SPI driver
m68knommu: formatting of pointers in printk()
m68knommu: arch/m68k/include/asm/ide.h fix for nommu
Diffstat (limited to 'fs/squashfs')
0 files changed, 0 insertions, 0 deletions