Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 283039
b: refs/heads/master
c: 25b8d2b
h: refs/heads/master
i:
  283037: 3cd58b5
  283035: a0d9de6
  283031: 06507ad
  283023: a23bf48
  283007: 848b852
v: v3
  • Loading branch information
Joe Perches authored and Linus Torvalds committed Jan 11, 2012
1 parent 87e6c78 commit 69394f0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 72dbb7051334c37c9210cd735684c304da8a5e85
refs/heads/master: 25b8d2b4fc4fd9f9ae7f95ce76bc47712c99809e
2 changes: 1 addition & 1 deletion trunk/MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1659,7 +1659,7 @@ L: linux-media@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
S: Maintained
F: Documentation/video4linux/cafe_ccic
F: drivers/media/video/cafe_ccic*
F: drivers/media/video/marvell-ccic/

CAIF NETWORK LAYER
M: Sjur Braendeland <sjur.brandeland@stericsson.com>
Expand Down

0 comments on commit 69394f0

Please sign in to comment.