]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ec00c56 45c5410)
Merge tag 'staging-3.3-rc3' into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2012 18:58:25 +0000 (10:58 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2012 18:58:25 +0000 (10:58 -0800)
commit4d58e9319e93e5146c92d24f1aa65e1c42918b74
treebd7a5be4484d539af13e6b345320455e989612cftree | snapshot
parentec00c56dcdf8c087acb80b25c5e8cb82075a0422commit | diff
parent45c5410cd797b0d53a9252174659a1a6a566eaedcommit | diff
Merge tag 'staging-3.3-rc3' into staging-next

This was done to resolve some merge issues with the following files that
had changed in both branches:
drivers/staging/rtl8712/rtl871x_sta_mgt.c
drivers/staging/tidspbridge/rmgr/drv_interface.c
drivers/staging/zcache/zcache-main.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 files changed:
drivers/staging/Kconfig diff1 | diff2 | blob | history
drivers/staging/Makefile diff1 | diff2 | blob | history
drivers/staging/android/Kconfig diff1 | diff2 | blob | history
drivers/staging/android/Makefile diff1 | diff2 | blob | history
drivers/staging/android/binder.c diff1 | diff2 | blob | history
drivers/staging/android/lowmemorykiller.c diff1 | diff2 | blob | history
drivers/staging/rtl8712/drv_types.h diff1 | diff2 | blob | history
drivers/staging/rtl8712/os_intfs.c diff1 | diff2 | blob | history
drivers/staging/rtl8712/usb_intf.c diff1 | diff2 | blob | history
drivers/staging/tidspbridge/core/tiomap3430.c diff1 | diff2 | blob | history
drivers/staging/tidspbridge/rmgr/drv_interface.c diff1 | diff2 | blob | history
drivers/staging/zcache/zcache-main.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.