From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jan 2010 21:57:19 +0000 (-0800)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.33-rc4~68
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d86527ddcab4684d1a051b5f35f023b4374b1271;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'release' of git://git./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__
---

d86527ddcab4684d1a051b5f35f023b4374b1271