| commit | 8b7231a9c76a321ecf907c1c7beaa8ce1aad3be0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 28 12:06:00 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 28 12:06:00 2010 -0700 |
| tree | 4f5f771f66a9b223b116742a8a04019cad287a4f | |
| parent | 93416253073511716f7e70c06e32c3810c3deac4 [diff] | |
| parent | e0fb8c418520b41d57667befdb8861c46cdf69e0 [diff] |
Merge branch 'fixes' of ssh://master.kernel.org/~sfr/next-fixes * 'fixes' of ssh://master.kernel.org/~sfr/next-fixes: acpi: update gfp/slab.h includes ocfs2: update gfp/slab.h includes davinci: update gfp/slab.h includes arm: update gfp/slab.h includes v4l-dvb: update gfp/slab.h includes