Merge branch 'e100-fixes' of git://198.78.49.142/~jbrandeb/linux-2.6