Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
commit2ec8c6bb5d8f3a62a79f463525054bae1e3d4487
authorDavid S. Miller <davem@davemloft.net>
Wed, 19 May 2010 06:01:55 +0000 (18 23:01 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 May 2010 06:01:55 +0000 (18 23:01 -0700)
treefa7f8400ac685fb52e96f64997c7c682fc2aa021
parent7b39f90fabcf9e2af0cd79d0a60440d821e22b56
parent537b60d17894b7c19a6060feae40299d7109d6e7
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
include/linux/mod_devicetable.h
scripts/mod/file2alias.c
MAINTAINERS
drivers/net/a2065.c
drivers/net/ariadne.c
drivers/net/zorro8390.c
include/linux/kernel.h
include/linux/mod_devicetable.h
scripts/mod/file2alias.c