| commit | 359d16ca1bd6adcd9f031da35d807f9c37ec6a6e | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 16 Aug 2013 23:49:06 +0000 (16 16:49 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 16 Aug 2013 23:49:06 +0000 (16 16:49 -0700) | ||
| tree | beaba817bad04e853a1319132892762be3803c02 | treesnapshot (tar.gz zip) |
| parent | 0f7dd1aa8f959216f1faa71513b9d3c1a9065e5a | commitdiff |
| parent | ea077b1b96e073eac5c3c5590529e964767fc5f7 | commitdiff |
Merge branch 'for-3.11' of git://git./linux/kernel/git/geert/linux-m68k
Pull m68k fixes from Geert Uytterhoeven:
"These are two critical fixes, needed by distro kernels, and thus also
destined for stable:
- The do_div() commit fixes a crash in mounting btrfs volumes, which
was a regression from 3.2,
- The ARAnyM fix allows to have NatFeat drivers as loadable modules,
which is needed for initrds"
* 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Truncate base in do_div()
m68k/atari: ARAnyM - Fix NatFeat module support
Pull m68k fixes from Geert Uytterhoeven:
"These are two critical fixes, needed by distro kernels, and thus also
destined for stable:
- The do_div() commit fixes a crash in mounting btrfs volumes, which
was a regression from 3.2,
- The ARAnyM fix allows to have NatFeat drivers as loadable modules,
which is needed for initrds"
* 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Truncate base in do_div()
m68k/atari: ARAnyM - Fix NatFeat module support