Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916...
[linux-2.6-block.git] / drivers / net / octeon /
drwxr-xr-x   ..
-rw-r--r-- 337 Kconfig
-rw-r--r-- 53 Makefile
-rw-r--r-- 30781 octeon_mgmt.c