merge r25946
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 8 Mar 2011 06:01:28 +0000 (06:01 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 8 Mar 2011 06:01:28 +0000 (06:01 +0000)
commitb785a9f67e00848c0ec5153ac46d969f6f29a365
tree79489ae8265778b265599176925c9b45c9addf31
parentf90586d3c9cae25333b6ee0692ffec244c63020c
merge r25946

SVN-Revision: 25947
include/site/linux