diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:33:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:33:01 -0800 |
| commit | ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132 (patch) | |
| tree | d498e947176f4b77938034ff6c6427f9875da721 /kernel | |
| parent | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | m68k,m68knommu: merge header files (diff) | |
| download | wireguard-linux-ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132.tar.xz wireguard-linux-ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k,m68knommu: merge header files
Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions