Merge branch 'asus-1.0.1.5-fixup' master
authorDaniel Egger <daniel@eggers-club.de>
Sun, 15 May 2011 23:47:33 +0000 (01:47 +0200)
committerDaniel Egger <daniel@eggers-club.de>
Sun, 15 May 2011 23:47:33 +0000 (01:47 +0200)
commite81a04df196d7004d7d1324f587e77f5ddf35a21
tree66f3bffd48762d74d96b3e07e5e999dfc2b7636a
parent2c614587d4f2d3ae197dafc377fd91febbc13527
parent3b351d754cf2693b72f0a9334ff214de498b916b
Merge branch 'asus-1.0.1.5-fixup'

Signed-off-by: Daniel Egger <daniel@eggers-club.de>
source/linux-2.6.21.x/include/linux/autoconf.h.orig
source/linux-2.6.21.x/include/linux/autoconf.h~
source/user/busybox/.config