| commit | d86527ddcab4684d1a051b5f35f023b4374b1271 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 08 13:57:19 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 08 13:57:19 2010 -0800 |
| tree | 681cc85e16defea8f3c4f8d011f08f79898138a8 | |
| parent | 0446e9d46347344dd2d794927f22eb81e1d1c296 [diff] | |
| parent | a651d80c7136029de3c044308fd63d88348915ff [diff] |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] move fnptr definition inside #ifdef __KERNEL__