diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 17:54:46 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 17:54:46 -0700 |
commit | bdfd6b7d761c7bb8bc93055dac5040ece7d58e10 (patch) | |
tree | 657c9adff148b2cb0f064c5cff96eafd3910d2e3 /drivers/gpu/drm/i915/intel_drv.h | |
parent | 6ad85239da45d035b2c786f73ec3c2798352c820 (diff) | |
parent | 9e1491de519712c73ec621c4ef4872eca6f2bb57 (diff) |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix ftrace
microblaze: Wire up new syscalls
microblaze: Fix level/edge irq sensibility
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
0 files changed, 0 insertions, 0 deletions