Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6

This commit is contained in:
Jeff Garzik 2006-02-07 02:05:17 -05:00
commit 3cfc15103a
2 changed files with 33 additions and 18 deletions