Commit Graph

2 Commits

Author SHA1 Message Date
Arne Fitzenreiter
38becfffb8 Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into arm-port
Conflicts:
	lfs/linux
2011-09-17 22:33:41 +00:00
Michael Tremer
6bb612ca11 Rename kernel configuration file. 2011-09-16 23:04:21 +02:00