Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Fri, 20 Jul 2012 02:39:03 +0000 (10:39 +0800)
committer黄涛 <huangtao@rock-chips.com>
Fri, 20 Jul 2012 02:39:03 +0000 (10:39 +0800)
commit92bbd51777c39c60867b0c9a6828cb882ea349d7
tree72b63f02fa848044f48b5f8c538ee65f5f3c3145
parentde1f128348ddaf446a3dde66b51b1666f22825cb
parentce05b1d31e57b7de6b814073e88bdd403ce71229
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

Conflicts:
Makefile
drivers/net/wireless/rt2x00/rt2x00usb.c
fs/buffer.c
kernel/time/timekeeping.c