diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-26 09:01:22 +1000 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-26 09:01:22 +1000 | 
| commit | 9948d378b99b06f6f34164dd8ff827e228ae9251 (patch) | |
| tree | 35de4877d4745bb9f219178f33629980168ba74d /kernel/trace/trace_workqueue.c | |
| parent | fd3830b379b87b9a47d796d79d1e41f73e1973fa (diff) | |
| parent | 45f1798484748894c348a76fcf0b9ec43d891795 (diff) | |
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
  mailmap: Add an entry for Axel Lin.
  video: fix some comments in drivers/video/console/vgacon.c
  drivers/video/bf537-lq035.c: Add missing IS_ERR test
  video: pxa168fb: remove a redundant pxa168fb_check_var call
  video: da8xx-fb: fix fb_probe error path
  video: pxa3xx-gcu: Return -EFAULT when copy_from_user() fails
  video: nuc900fb: properly free resources in nuc900fb_remove
  video: nuc900fb: fix compile error
Diffstat (limited to 'kernel/trace/trace_workqueue.c')
0 files changed, 0 insertions, 0 deletions
