Skip to content

Commit

Permalink
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…
Browse files Browse the repository at this point in the history 
…t/torvalds/linux-2.6
  • Loading branch information
@dwmw2
dwmw2 committed Jul 23, 2007
2 parents 0fc72b8 + f695baf commit 39fe543
Show file tree
Hide file tree
Showing 5,093 changed files with 285,498 additions and 167,210 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
tags
TAGS
vmlinux*
!vmlinux.lds.S
System.map
Module.symvers

Expand All @@ -45,3 +46,6 @@ series

# cscope files
cscope.*

*.orig
*.rej
10 changes: 5 additions & 5 deletions CREDITS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2212,13 +2212,13 @@ S: 2300 Copenhagen S
S: Denmark

N: Claudio S. Matsuoka
E: claudio@conectiva.com
E: claudio@helllabs.org
E: cmatsuoka@gmail.com
E: claudio@mandriva.com
W: http://helllabs.org/~claudio
D: V4L, OV511 driver hacks
D: V4L, OV511 and HDA-codec hacks
S: Conectiva S.A.
S: R. Tocantins 89
S: 80050-430 Curitiba PR
S: Souza Naves 1250
S: 80050-040 Curitiba PR
S: Brazil

N: Heinz Mauelshagen
Expand Down
Loading

0 comments on commit 39fe543

Please sign in to comment.