OSDN Git Service

Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Aug 2015 04:57:19 +0000 (14:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Aug 2015 04:57:21 +0000 (14:57 +1000)
commit722b53feaa749a5e63bce830e32706420cde4cae
tree076fe9c2d2b85fa91d4c46a08ef400ef39b94c1d
parent2152da9e6f442f1b6a050c680532576becdd03a2
parent415bcb5c6eff630967baa4e671cebe883d83ee79
Merge remote-tracking branch 'staging/staging-next'
Documentation/DocBook/Makefile
MAINTAINERS
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/android/ion/ion_chunk_heap.c
drivers/staging/lustre/lustre/llite/lloop.c
drivers/staging/octeon/ethernet-tx.c
drivers/staging/octeon/ethernet.c
drivers/staging/wilc1000/linux_mon.c
drivers/video/fbdev/Kconfig