summaryrefslogtreecommitdiff
path: root/mausezahn
AgeCommit message (Expand)AuthorFilesLines
2013-07-30build: reduce Extra contents to bare minimumDaniel Borkmann1-0/+2
2013-07-11build: refactor tool specific flags into <tool>/MakefileDaniel Borkmann1-0/+5
2013-06-04xutils: eliminate xutils, move rest to epoll2Daniel Borkmann1-3/+1
2013-06-04sock: add socket management functionsDaniel Borkmann1-0/+1
2013-06-04xutils: break out string handling and lockingDaniel Borkmann1-0/+1
2013-05-13staging: add mausezahn staging directoryDaniel Borkmann2-0/+70
23d2a262afd4aebb1e89fe6985 /include/dt-bindings/memory/mt8173-larb-port.h parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/dt-bindings/memory/mt8173-larb-port.h')