diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:24:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:24:34 -0700 |
| commit | 3cf8ad3394b8675e92a35c438f22341197535531 (patch) | |
| tree | 39c9c5b9465e4f63f6cdf9b767d8046eaf0f3ac7 /net/ipv4/inet_hashtables.c | |
| parent | 66cd55d2b903643cbd019ef97a5305d9428d3865 (diff) | |
| parent | 54e5bc020ce1c959eaa7be18cedb734b6b13745e (diff) | |
Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, olpc: Constify an olpc_ofw() arg
x86, olpc: Use pr_debug() for EC commands
x86, olpc: Add comment about implicit optimization barrier
x86, olpc: Add support for calling into OpenFirmware
Diffstat (limited to 'net/ipv4/inet_hashtables.c')
0 files changed, 0 insertions, 0 deletions