Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/isdn/i4l/isdn_net.c fs/cifs/connect.c
Documentation/acpi/debug.txt
0 → 100644
Documentation/c2port.txt
0 → 100644
Documentation/hwmon/adt7462
0 → 100644