diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-04-19 22:23:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-04-19 22:23:26 -0300 |
| commit | f5bcd42b9ad31ef8b390ca3f26ecfd66dd7de518 (patch) | |
| tree | cfbc017e8b69168b232f7d0f5b0479af18d7253d /Documentation/ia64/aliasing-test.c | |
| parent | dc2443487fa7120f7accdf24fcbea7921407ff9f (diff) | |
| parent | a4761a092fd3b6bf8b5f9cfe361670c86cdcc8ca (diff) | |
Merge /home/v4l/v4l/patchwork
* /home/v4l/v4l/patchwork: (586 commits)
[media] tm6000: fix vbuf may be used uninitialized
[media] lirc_sasem: key debug spew off debug modparam
[media] ttusb-budget: driver has a debug param, use it
[media] mceusb: Formosa e017 device has no tx
[media] rc/nuvoton-cir: enable CIR on w83667hg chip variant
[media] rc/nuvoton-cir: only warn about unknown chips
[media] rc: further key name standardization
[media] mceusb: tivo transceiver should default to tivo keymap
[media] rc: add tivo/nero liquidtv keymap
[media] gspca - kinect: New subdriver for Microsoft Kinect
[media] Add Y10B, a 10 bpp bit-packed greyscale format
[media] gspca - zc3xx: Adjust the mc501cb exchanges
[media] gspca - jeilinj: add SPORTSCAM specific controls
[media] gspca - jeilinj: Add SPORTSCAM_DV15 camera support
[media] gspca - jeilinj: add 640*480 resolution support
[media] gspca - jeilinj: use gspca_dev->usb_err to forward error to upper layer
[media] gspca - jeilinj: suppress workqueue
Linux 2.6.39-rc4
proc: do proper range check on readdir offset
next_pidmap: fix overflow condition
...
Conflicts:
Documentation/DocBook/media-entities.tmpl
Documentation/DocBook/v4l/pixfmt.xml
drivers/media/video/omap3isp/isp.c
Diffstat (limited to 'Documentation/ia64/aliasing-test.c')
| -rw-r--r-- | Documentation/ia64/aliasing-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ia64/aliasing-test.c b/Documentation/ia64/aliasing-test.c index 3dfb76ca6931..5caa2af33207 100644 --- a/Documentation/ia64/aliasing-test.c +++ b/Documentation/ia64/aliasing-test.c @@ -177,7 +177,7 @@ static int scan_rom(char *path, char *file) /* * It's OK if the ROM is unreadable. Maybe there - * is no ROM, or some other error ocurred. The + * is no ROM, or some other error occurred. The * important thing is that no MCA happened. */ if (rc > 0) |