summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-28 23:12:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-28 23:12:28 -0700
commit139f37f5e14cd883eee2a8a36289f544b5390a44 (patch)
tree90598e62f04fbbaab94ff8fefe5a2f92f5c85f52 /fs/ecryptfs
parent5be7ef002469eaf757065ee16b4100c6d3ead1cc (diff)
parentc320afe965bf3f857249d223801d8f2fc95615c2 (diff)
downloadop-kernel-dev-139f37f5e14cd883eee2a8a36289f544b5390a44.zip
op-kernel-dev-139f37f5e14cd883eee2a8a36289f544b5390a44.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: Blackfin: debug-mmrs: include RSI_PID[4567] MMRs Blackfin: bf51x: fix up RSI_PID# MMR defines Blackfin: bf52x/bf54x: fix up usb MMR defines Blackfin: debug-mmrs: fix typos with gptimers/mdma/ppi Blackfin: gptimers: add structure for hardware register layout Blackfin: wire up new sendmmsg syscall Blackfin: mach/bfin_serial_5xx.h: punt now-unused header Blackfin: bfin_serial.h: turn default port wrappers into stubs
Diffstat (limited to 'fs/ecryptfs')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud