diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-07 20:20:01 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-07 20:20:01 +0400 |
commit | 10ec5e6c0cfcc4289c0cb056cd330ad70ea39b7f (patch) | |
tree | 6967bfd9e2f3f26d150909c5cd1e6e9f31c7f335 /fs/file_table.c | |
parent | 3172f8fe1ca1d432b196efad453c0ceb89302075 (diff) | |
parent | 24bb5a0ce39c51a2e2602c947f218a19e4b26d7d (diff) | |
download | linux-10ec5e6c0cfcc4289c0cb056cd330ad70ea39b7f.tar.xz |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
vmwgfx: Use kcalloc instead of kzalloc to allocate array
drm/i915: fix infinite recursion on unbind due to ilk vt-d w/a
drm/radeon/kms: fix return type for radeon_encoder_get_dp_bridge_encoder_id
Diffstat (limited to 'fs/file_table.c')
0 files changed, 0 insertions, 0 deletions