diff options
author | 2009-09-07 11:40:15 -0700 | |
---|---|---|
committer | 2009-09-07 11:40:15 -0700 | |
commit | cbeb2864b162f4298111196c8ce8ce492577cdee (patch) | |
tree | 0ddc68c3c1231a38955d7fca71a28cfc43eb0996 /fs/jbd2/commit.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel (diff) | |
parent | pcmcia: add CNF-CDROM-ID for ide (diff) | |
download | wireguard-linux-cbeb2864b162f4298111196c8ce8ce492577cdee.tar.xz wireguard-linux-cbeb2864b162f4298111196c8ce8ce492577cdee.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
pcmcia: add CNF-CDROM-ID for ide
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions