[backfire] merge r21261 & r21262
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 5 May 2010 11:22:44 +0000 (11:22 +0000)
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 5 May 2010 11:22:44 +0000 (11:22 +0000)
commit47f82141ce2e246a8397c981017aa4ffabdee93f
tree01d859668d48530700a937fea85522c537340fa5
parentaa0bcb7212f8c2a1c0fe9f24fce59d3ed6d0b7d5
[backfire] merge r21261 & r21262

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21376 3c298f89-4303-0410-b956-a3cf2f4a3e73
package/kernel/modules/other.mk
target/linux/generic-2.4/config-default