diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-03-24 15:25:34 -0400 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-03-24 15:25:34 -0400 |
commit | 61454f33389ecfac68846e07d29c8d18af342c43 (patch) | |
tree | 7dcf069151aa7331c9261d262df4c192b2fabc34 /CREDITS | |
parent | 4740cd8b4f27d6ac11e76c432d5d03fb780b2596 (diff) | |
parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'CREDITS')
-rw-r--r-- | CREDITS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3738,7 +3738,7 @@ S: 93149 Nittenau | |||
3738 | S: Germany | 3738 | S: Germany |
3739 | 3739 | ||
3740 | N: Gertjan van Wingerde | 3740 | N: Gertjan van Wingerde |
3741 | E: gwingerde@home.nl | 3741 | E: gwingerde@gmail.com |
3742 | D: Ralink rt2x00 WLAN driver | 3742 | D: Ralink rt2x00 WLAN driver |
3743 | D: Minix V2 file-system | 3743 | D: Minix V2 file-system |
3744 | D: Misc fixes | 3744 | D: Misc fixes |