Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6.git] / usr / gen_init_cpio.c
2005-04-16 Linus Torvalds Linux-2.6.12-rc2