Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev...
[pandora-kernel.git] / arch / um / scripts /
drwxr-xr-x   ..
-rw-r--r-- 1119 Makefile.rules