OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0446e9d
a651d80
)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
author
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 8 Jan 2010 21:57:19 +0000
(13:57 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 8 Jan 2010 21:57:19 +0000
(13:57 -0800)
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] move fnptr definition inside #ifdef __KERNEL__
Trivial merge