diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-18 14:55:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-18 14:55:19 -0400 |
| commit | f32c23f59a3af0c5bb9e198386f2e6cd22038e9f (patch) | |
| tree | 24b80055498bb88cceba49f7d6c885cca4d5b0e5 /drivers/net/tun.c | |
| parent | e899536470ec83f2792092640148f2488961731b (diff) | |
| parent | 65ba6cdc837af9b77354d03987354196ac4eb308 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Clear sub-page HPTE present bits when demoting page size
[POWERPC] 4xx: Clear new TLB cache attribute bits in Data Storage vector
Diffstat (limited to 'drivers/net/tun.c')
0 files changed, 0 insertions, 0 deletions