Merge branch '20101221_static_const' of git://repo.or.cz/linux-2.6/trivial-mods