Merge branch 'next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 3 Dec 2011 09:23:47 +0000 (10:23 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 3 Dec 2011 09:23:47 +0000 (10:23 +0100)
commit6c22de5561913d751954df791ebf29e00c33f867
tree1f795c0fe8b1205e1c4f2ad5710c65905cc9f70f
parent130d16b971b2d525762b32e335b0208fbbe58fb0
parent89f3d66c24acadc30c72c97fc8012e9f995e7eee
Merge branch 'next'

Conflicts:
lfs/e1000
lfs/e1000e
lfs/igb
lfs/lcd4linux
make.sh