Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata...
[powerpc.git] / drivers / char / nvram.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2