diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-25 14:51:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-25 14:51:42 -0400 |
| commit | e569aa78ba01f7f66e016a4d57310fd041524d17 (patch) | |
| tree | eaedc03d42ee2bf6200fc07b080a99bad103def3 /Documentation/DocBook/Makefile | |
| parent | 4562487a00445eab96311365ba15c41dc4d043cd (diff) | |
| parent | 268bae0b6879f238ba57f5f801958d1254e136f7 (diff) | |
| download | blackbird-op-linux-e569aa78ba01f7f66e016a4d57310fd041524d17.tar.gz blackbird-op-linux-e569aa78ba01f7f66e016a4d57310fd041524d17.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/libertas/if_sdio.c
Diffstat (limited to 'Documentation/DocBook/Makefile')
| -rw-r--r-- | Documentation/DocBook/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 34929f24c284..8b6e00a71034 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -12,7 +12,7 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \ kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \ gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \ - mac80211.xml debugobjects.xml sh.xml regulator.xml \ + 80211.xml debugobjects.xml sh.xml regulator.xml \ alsa-driver-api.xml writing-an-alsa-driver.xml \ tracepoint.xml media.xml drm.xml |
