projects / linux-drm-fsl-dcu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8cbc95e 7dfbcbe)
Merge tag 'for-linus-v3.10-rc1-2' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2013 20:06:20 +0000 (13:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2013 20:06:20 +0000 (13:06 -0700)
commit8769e078a9a2bce13d39c08e0e5a513f5320e1de
tree4f63f3e0179a5b0a17f961f86e775393c8cf1732tree | snapshot
parent8cbc95ee748741939222c3d38584a40c92bedcddcommit | diff
parent7dfbcbefad4b24d9822d04dbd7b5dd5c3fd45076commit | diff
Merge tag 'for-linus-v3.10-rc1-2' of git://oss.sgi.com/xfs/xfs

Pull xfs update (#2) from Ben Myers:

 - add CONFIG_XFS_WARN, a step between zero debugging and
   CONFIG_XFS_DEBUG.

 - fix attrmulti and attrlist to fall back to vmalloc when kmalloc
   fails.

* tag 'for-linus-v3.10-rc1-2' of git://oss.sgi.com/xfs/xfs:
  xfs: fallback to vmalloc for large buffers in xfs_compat_attrlist_by_handle
  xfs: fallback to vmalloc for large buffers in xfs_attrlist_by_handle
  xfs: introduce CONFIG_XFS_WARN
Freescale DCU DRM driver