Merge remote branch 'linux-2.6.32.y/master' into develop
author黄涛 <huangtao@rock-chips.com>
Sun, 13 Feb 2011 02:25:30 +0000 (10:25 +0800)
committer黄涛 <huangtao@rock-chips.com>
Sun, 13 Feb 2011 02:25:30 +0000 (10:25 +0800)
commit84aa38e58d1115f2562cdbed32c57ed9a6e460e8
tree85bea30550d73322f3bf4e49b276ea92243ea749
parent9505d021e0c4e93eb854ae380529c04c81ddcf6f
parent376faec0f6faf74daa71b52fb57cff5214c2abf3
Merge remote branch 'linux-2.6.32.y/master' into develop

Conflicts:
drivers/net/wireless/orinoco/main.c
drivers/net/wireless/orinoco/wext.c
drivers/net/wireless/p54/p54usb.c
kernel/printk.c