aboutsummaryrefslogtreecommitdiff
path: root/fs/cifs
diff options
context:
space:
mode:
authorLinus Torvalds2015-05-31 12:03:42 -0700
committerLinus Torvalds2015-05-31 12:03:42 -0700
commite4ca714b6363bbb4c8a6020482028815fc6d947f (patch)
tree6581428d1d53b7c9ea37b1d617eee8592923e0a4 /fs/cifs
parent50f5a1ee32ba2dd8f7221e4d841249edf81b9075 (diff)
parentc4fca4fdea940bda2cff6b844cda6af8ef1c79cc (diff)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/linux
Pull MIPS fixes from Ralf Baechle: "MIPS fixes for 4.1 all across the tree" * 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/linux: MIPS: strnlen_user.S: Fix a CPU_DADDI_WORKAROUNDS regression MIPS: BMIPS: Fix bmips_wr_vec() MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set MIPS: Fuloong 2E: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760 MIPS: irq: Use DECLARE_BITMAP ttyFDC: Fix to use native endian MMIO reads MIPS: Fix CDMM to use native endian MMIO reads
Diffstat (limited to 'fs/cifs')
0 files changed, 0 insertions, 0 deletions