summaryrefslogtreecommitdiff
path: root/staging/dns.c
AgeCommit message (Expand)AuthorFilesLines
2013-05-13staging: add mausezahn staging directoryDaniel Borkmann1-0/+817
emove'/>
context:
space:
mode:
Diffstat (limited to 'arch/arm/boot/dts/sun6i-a31-app4-evb1.dts')
next.git/commit/?h=nds-private-remove&id=0b98027122d0715aa2dc39882e4c295112275785'>0b98027122d0715aa2dc39882e4c295112275785 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fix from Greg Ungerer: "This contains only a single fix for a register corruption problem on certain types of m68k flat format binaries" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: fix user a5 register being overwritten
Diffstat